From c98d03011e7c5d2065e11ae1859cfc8f7c8f32d8 Mon Sep 17 00:00:00 2001 From: Jonathan Peyton Date: Wed, 3 Jun 2015 17:26:47 +0000 Subject: [PATCH] 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 --- openmp/runtime/src/kmp_wait_release.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/openmp/runtime/src/kmp_wait_release.h b/openmp/runtime/src/kmp_wait_release.h index 3073a07117d7..31d76a1df877 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(p, flag_oncore), num_waiting_threads(0), flag_switch(false) {} kmp_flag_oncore(volatile kmp_uint64 *p, kmp_uint32 idx) - : kmp_flag(p, flag_oncore), offset(idx), num_waiting_threads(0), flag_switch(false) {} + : kmp_flag(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(p, flag_oncore), checker(c), offset(idx), bt(bar_t), this_thr(thr) + : kmp_flag(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