Commit 46f49143 authored by Stephan Seitz's avatar Stephan Seitz
Browse files

Fix issues in LatticeModel.tmpl.h

- stop clang from bitching around due to floating point conversions
- support empty initializer lists (don't print single `,`)
parent f717b74d
Pipeline #21513 failed with stage
in 1 minute and 9 seconds
...@@ -48,12 +48,14 @@ ...@@ -48,12 +48,14 @@
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-parameter" #pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wconversion"
#endif #endif
#ifdef WALBERLA_CXX_COMPILER_IS_CLANG #ifdef WALBERLA_CXX_COMPILER_IS_CLANG
#pragma clang diagnostic push #pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunused-variable" #pragma clang diagnostic ignored "-Wunused-variable"
#pragma clang diagnostic ignored "-Wunused-parameter" #pragma clang diagnostic ignored "-Wunused-parameter"
#pragma clang diagnostic ignored "-Wconversion"
#endif #endif
{% set lmIgnores = ('pdfs', 'pdfs_tmp') %} {% set lmIgnores = ('pdfs', 'pdfs_tmp') %}
...@@ -123,7 +125,7 @@ public: ...@@ -123,7 +125,7 @@ public:
}; };
{{class_name}}( {{stream_collide_kernel|generate_constructor_parameters(lmIgnores+lmOffsets) }} ) {{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 ); } void configure( IBlock & block, StructuredBlockStorage & storage ) { configureBlock( &block, &storage ); }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment