From e3775228792d9fde5613af7250deb656324f4b76 Mon Sep 17 00:00:00 2001 From: Michel Ferrero Date: Wed, 21 May 2014 00:28:40 +0200 Subject: [PATCH] Fix wrong commit 068c4a1 The fix in simple_read_write was wrong. This should be correct now. --- triqs/arrays/h5/simple_read_write.hpp | 2 +- triqs/python_tools/wrapper_tools.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/triqs/arrays/h5/simple_read_write.hpp b/triqs/arrays/h5/simple_read_write.hpp index f3af03c6..99296336 100644 --- a/triqs/arrays/h5/simple_read_write.hpp +++ b/triqs/arrays/h5/simple_read_write.hpp @@ -74,7 +74,7 @@ namespace arrays { template void read_array_impl(h5::group g, std::string const& name, T* start, array_stride_info info); template void read_array(h5::group g, std::string const& name, A&& a, bool C_reorder = true) { - resize_or_check(a, mini_vector (get_array_lengths(a.rank, g, name, triqs::is_complex::value_type>::value))); + resize_or_check(a, mini_vector::rank> (get_array_lengths(a.rank, g, name, triqs::is_complex::value_type>::value))); if (C_reorder) { { // read_array(g, name, make_cache(a).view(), false); diff --git a/triqs/python_tools/wrapper_tools.hpp b/triqs/python_tools/wrapper_tools.hpp index ed331dfe..768b0d53 100644 --- a/triqs/python_tools/wrapper_tools.hpp +++ b/triqs/python_tools/wrapper_tools.hpp @@ -7,7 +7,7 @@ #include #pragma clang diagnostic ignored "-Wdeprecated-writable-strings" -#pragma GCC diagnostic ignored "-Wdeprecated-writable-strings" +#pragma GCC diagnostic ignored "-Wwrite-strings" // I can use the trace in triqs::exception #define CATCH_AND_RETURN(MESS,RET)\