summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Peyton <jonathan.l.peyton@intel.com>2015-06-03 17:26:47 +0000
committerJonathan Peyton <jonathan.l.peyton@intel.com>2015-06-03 17:26:47 +0000
commitc98d03011e7c5d2065e11ae1859cfc8f7c8f32d8 (patch)
tree7d24cf4962fc7e4340313664b8e0eca2b1e559fb
parent8d5ab875f6370a9433824c6d2803f18fb57fb3de (diff)
downloadbcm5719-llvm-c98d03011e7c5d2065e11ae1859cfc8f7c8f32d8.tar.gz
bcm5719-llvm-c98d03011e7c5d2065e11ae1859cfc8f7c8f32d8.zip
Reorder C++ initialization lists to appease compiler.
in kmp_wait_release.h, there were some constructors where the initialization lists were out of order with the member declarations inside the class. This patch just reorders the initialization list so the compiler doesn't complain. http://lists.cs.uiuc.edu/pipermail/openmp-dev/2015-June/000670.html Patch by Jack Howarth and Jonathan Peyton llvm-svn: 238946
-rw-r--r--openmp/runtime/src/kmp_wait_release.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/openmp/runtime/src/kmp_wait_release.h b/openmp/runtime/src/kmp_wait_release.h
index 3073a07117d..31d76a1df87 100644
--- a/openmp/runtime/src/kmp_wait_release.h
+++ b/openmp/runtime/src/kmp_wait_release.h
@@ -464,18 +464,19 @@ public:
kmp_flag_oncore(volatile kmp_uint64 *p)
: kmp_flag<kmp_uint64>(p, flag_oncore), num_waiting_threads(0), flag_switch(false) {}
kmp_flag_oncore(volatile kmp_uint64 *p, kmp_uint32 idx)
- : kmp_flag<kmp_uint64>(p, flag_oncore), offset(idx), num_waiting_threads(0), flag_switch(false) {}
+ : kmp_flag<kmp_uint64>(p, flag_oncore), num_waiting_threads(0), offset(idx), flag_switch(false) {}
kmp_flag_oncore(volatile kmp_uint64 *p, kmp_uint64 c, kmp_uint32 idx, enum barrier_type bar_t,
kmp_info_t * thr
#if USE_ITT_BUILD
, void *itt
#endif
)
- : kmp_flag<kmp_uint64>(p, flag_oncore), checker(c), offset(idx), bt(bar_t), this_thr(thr)
+ : kmp_flag<kmp_uint64>(p, flag_oncore), checker(c), num_waiting_threads(0), offset(idx),
+ flag_switch(false), bt(bar_t), this_thr(thr)
#if USE_ITT_BUILD
, itt_sync_obj(itt)
#endif
- , num_waiting_threads(0), flag_switch(false) {}
+ {}
kmp_info_t * get_waiter(kmp_uint32 i) {
KMP_DEBUG_ASSERT(i<num_waiting_threads);
return waiting_threads[i];
OpenPOWER on IntegriCloud