From: Wolfgang Bangerth Date: Fri, 17 Apr 2015 01:50:05 +0000 (-0500) Subject: Avoid a warning with recently enabled -Wxxx flags. X-Git-Tag: v8.3.0-rc1~259^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee8025fbee5cb089aecef21be83704b94dacb814;p=dealii.git Avoid a warning with recently enabled -Wxxx flags. Specifically, we get the following warning: /home/bangerth/p/deal.II/1/dealii/bundled/tbb41_20130401oss/src/tbb/governor.cpp:64:1: warning: missing initializer for member 'tbb::internal::dynamic_link_descriptor::ptr' [-Wmissing-field-initializers] --- diff --git a/bundled/tbb41_20130401oss/src/tbb/governor.cpp b/bundled/tbb41_20130401oss/src/tbb/governor.cpp index 0f2b469a97..ef19f4fc7c 100644 --- a/bundled/tbb41_20130401oss/src/tbb/governor.cpp +++ b/bundled/tbb41_20130401oss/src/tbb/governor.cpp @@ -60,7 +60,12 @@ static __cilk_tbb_retcode (*watch_stack_handler)(struct __cilk_tbb_unwatch_thunk //! Table describing how to link the handlers. static const dynamic_link_descriptor CilkLinkTable[] = { - { "__cilkrts_watch_stack", (pointer_to_handler*)(void*)(&watch_stack_handler) } + { "__cilkrts_watch_stack", (pointer_to_handler*)(void*)(&watch_stack_handler) +#if __TBB_WEAK_SYMBOLS_PRESENT + , + NULL +#endif + } }; static atomic cilkrts_load_state;