]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Avoid a warning with recently enabled -Wxxx flags. 818/head
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Fri, 17 Apr 2015 01:50:05 +0000 (20:50 -0500)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Fri, 17 Apr 2015 01:50:05 +0000 (20:50 -0500)
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]

bundled/tbb41_20130401oss/src/tbb/governor.cpp

index 0f2b469a97a2dcce6167551d784f536645aac7f7..ef19f4fc7c71d6a51ee1eea492287e13c4a782a3 100644 (file)
@@ -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<do_once_state> cilkrts_load_state;

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.