diff --git a/test/speed/array2.cpp b/test/speed/array2.cpp index b0226b5e..1759926b 100644 --- a/test/speed/array2.cpp +++ b/test/speed/array2.cpp @@ -50,7 +50,7 @@ struct expression_template { MM B(A), C(A), D(A); - auto ex = B + 3* C+ D; + //auto ex = B + 3* C+ D; for (int u =0; u<5000; ++u) A = B + 3*C + D; } @@ -84,7 +84,7 @@ struct expression_template_big { MM B(A), C(A), D(A); - auto ex = B + 3* C+ D; + //auto ex = B + 3* C+ D; for (int u =0; u<500; ++u) A = B + 3*C + D; } diff --git a/test/triqs/arrays/array_algebra.cpp b/test/triqs/arrays/array_algebra.cpp index d6816cf8..21e0c4a2 100644 --- a/test/triqs/arrays/array_algebra.cpp +++ b/test/triqs/arrays/array_algebra.cpp @@ -43,6 +43,7 @@ int main() { auto x = A + B + 2*A; + std::cerr << x << std::endl; C = A+2*A+3*A - 2*A+A -A+A+A*3+A+A+A+A+A+A+A+A+A+A+A+A+A; std::cout << C << std::endl ; diff --git a/test/triqs/arrays/const_view.cpp b/test/triqs/arrays/const_view.cpp index fcc715dd..c18a56bd 100644 --- a/test/triqs/arrays/const_view.cpp +++ b/test/triqs/arrays/const_view.cpp @@ -36,7 +36,6 @@ int main(int argc, char **argv) { { array A(2, 3); A() = 3; - auto const &AA = A; f2(A()); diff --git a/test/triqs/det_manip/det_manip1.cpp b/test/triqs/det_manip/det_manip1.cpp index 6bc2a26a..2221fd59 100644 --- a/test/triqs/det_manip/det_manip1.cpp +++ b/test/triqs/det_manip/det_manip1.cpp @@ -63,7 +63,6 @@ struct test { std::cerr<<" ------------------------------------------------"<::invoke(); } - friend class gfs_implementation::h5_rw; + friend struct gfs_implementation::h5_rw; /// Write into HDF5 friend void h5_write(h5::group fg, std::string subgroup_name, gf_impl const &g) { diff --git a/triqs/gfs/local/tail.hpp b/triqs/gfs/local/tail.hpp index 7bf728ae..a2d78805 100644 --- a/triqs/gfs/local/tail.hpp +++ b/triqs/gfs/local/tail.hpp @@ -97,7 +97,7 @@ namespace triqs { namespace gfs { namespace local { mask() = order_min+size_-1; _data() = 0; } - tail_impl(data_type const &d, mask_type const &m, long omin_): mask(m), _data(d), omin(omin_) {} + tail_impl(data_type const &d, mask_type const &m, long omin_) : omin(omin_), mask(m), _data(d) {} tail_impl(tail_impl const & x): omin(x.omin), mask(x.mask), _data(x._data) {} tail_impl(tail_impl const &) = default; tail_impl(tail_impl &&) = default; @@ -309,9 +309,9 @@ namespace triqs { namespace gfs { namespace local { inline tail mult_impl(tail_view const & l, tail_view const& r) { if (l.shape()[1] != r.shape()[0] || l.order_min() != r.order_min() || l.size() != r.size()) TRIQS_RUNTIME_ERROR<< "tail multiplication: shape mismatch"; - long omin1 = l.smallest_nonzero() + r.smallest_nonzero(); + //long omin1 = l.smallest_nonzero() + r.smallest_nonzero(); long omax1 = std::min(std::min(r.order_max()+l.smallest_nonzero(), l.order_max()+r.smallest_nonzero()), r.order_min()+long(r.size())-1); - size_t si = omax1-omin1+1; + //size_t si = omax1-omin1+1; tail res(l.shape(), l.size(), l.order_min()); res.mask_view() = omax1; diff --git a/triqs/utility/c14.hpp b/triqs/utility/c14.hpp index a3549b6f..4676b344 100644 --- a/triqs/utility/c14.hpp +++ b/triqs/utility/c14.hpp @@ -18,8 +18,7 @@ * TRIQS. If not, see . * ******************************************************************************/ -#ifndef TRIQS_C14_FIX_H -#define TRIQS_C14_FIX_H +#pragma once #include //#include #include @@ -57,11 +56,7 @@ namespace std { template auto get(c14::tuple const & t) DECL_AND_RETURN( std::get(static_cast>(t))); - template struct tuple_size>: tuple_size>{}; - + template class tuple_size>: public tuple_size>{}; } - -#endif - diff --git a/triqs/utility/tuple_tools.hpp b/triqs/utility/tuple_tools.hpp index 80ef98f4..2fcd748b 100644 --- a/triqs/utility/tuple_tools.hpp +++ b/triqs/utility/tuple_tools.hpp @@ -42,7 +42,7 @@ namespace std { template auto get(_triqs_reversed_tuple && t) DECL_AND_RETURN(std::get::type>::type>::value-1-pos>(move(t)._x)); - template struct tuple_size<_triqs_reversed_tuple> : tuple_size::type>::type>{}; + template class tuple_size<_triqs_reversed_tuple> : public tuple_size::type>::type>{}; } namespace triqs { namespace tuple {