From 46f49143ff50f558ff69c372a942d896304d7b8b Mon Sep 17 00:00:00 2001
From: Stephan Seitz <stephan.seitz@fau.de>
Date: Wed, 29 Jan 2020 16:10:34 +0100
Subject: [PATCH] Fix issues in LatticeModel.tmpl.h
- stop clang from bitching around due to floating point conversions
- support empty initializer lists (don't print single `,`)
---
lbmpy_walberla/templates/LatticeModel.tmpl.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lbmpy_walberla/templates/LatticeModel.tmpl.h b/lbmpy_walberla/templates/LatticeModel.tmpl.h
index 4224136..744eacc 100644
--- a/lbmpy_walberla/templates/LatticeModel.tmpl.h
+++ b/lbmpy_walberla/templates/LatticeModel.tmpl.h
@@ -48,12 +48,14 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wconversion"
#endif
#ifdef WALBERLA_CXX_COMPILER_IS_CLANG
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunused-variable"
#pragma clang diagnostic ignored "-Wunused-parameter"
+#pragma clang diagnostic ignored "-Wconversion"
#endif
{% set lmIgnores = ('pdfs', 'pdfs_tmp') %}
@@ -123,7 +125,7 @@ public:
};
{{class_name}}( {{stream_collide_kernel|generate_constructor_parameters(lmIgnores+lmOffsets) }} )
- : {{ stream_collide_kernel|generate_constructor_initializer_list(lmIgnores+lmOffsets) }}, currentLevel(0)
+ : {{ stream_collide_kernel|generate_constructor_initializer_list(lmIgnores+lmOffsets) }}{% if stream_collide_kernel|generate_constructor_initializer_list(lmIgnores+lmOffsets)|length %},{% endif %} currentLevel(0)
{};
void configure( IBlock & block, StructuredBlockStorage & storage ) { configureBlock( &block, &storage ); }
--
GitLab