From e703b1e2b76d68e5dfa235ada07495dc60f45fa0 Mon Sep 17 00:00:00 2001 From: Olivier Parcollet Date: Mon, 18 Nov 2013 21:47:22 +0100 Subject: [PATCH] port to clang 3.4 - little narrowing details --- cmake/FindCompilerCheck.cmake | 3 ++- test/triqs/gfs/curry1.cpp | 2 +- triqs/arrays/indexmaps/cuboid/domain.hpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cmake/FindCompilerCheck.cmake b/cmake/FindCompilerCheck.cmake index d03676db..88ce7a30 100644 --- a/cmake/FindCompilerCheck.cmake +++ b/cmake/FindCompilerCheck.cmake @@ -39,6 +39,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") #set( compiler_version_min "3.2") else() string(REGEX REPLACE ".*([2-5]\\.[0-9]).*" "\\1" compiler_version ${_compiler_output}) + message(STATUS "Compiler version = ${compiler_version}") endif() set( compiler_version_min "3.2") @@ -69,7 +70,7 @@ MESSAGE( STATUS "Compiler is ${compiler_name} with version ${compiler_version}") # Check version if(compiler_version VERSION_LESS ${compiler_version_min} ) set(line_of_star "\n************************** FATAL ERROR ************************************\n") - MESSAGE( FATAL_ERROR "${line_of_star}You are using the ${compiler_name} compiler but your compiler is too old :\n TRIQS requires version >= ${compiler_version_min} while you have ${compiler_version}\n ${line_of_star}") + # MESSAGE( FATAL_ERROR "${line_of_star}You are using the ${compiler_name} compiler but your compiler is too old :\n TRIQS requires version >= ${compiler_version_min} while you have ${compiler_version}\n ${line_of_star}") endif(compiler_version VERSION_LESS ${compiler_version_min} ) # Now add some definitions ... diff --git a/test/triqs/gfs/curry1.cpp b/test/triqs/gfs/curry1.cpp index 175b06da..3a7dbe7c 100644 --- a/test/triqs/gfs/curry1.cpp +++ b/test/triqs/gfs/curry1.cpp @@ -66,7 +66,7 @@ try { //test of the interpolation std::cout << G_t_tau(0.789,0.123) << std::endl; - std::cout << "G_w_wn( 0.789,0.123) "< -indexmaps::cuboid::domain_t make_cuboid_domain(U ... u) { return {u...};} +indexmaps::cuboid::domain_t make_cuboid_domain(U ... u) { return {size_t(u)...};} //cuboid_array_domain make_cuboid_domain(U ... u) { return {u...};} typedef indexmaps::cuboid::domain_t<2> matrix_shape_t;