Let the code compile with OMPD_SUPPORT

Author: jprotze

runtime/src/ompd-specific.cpp

@@ -72,23 +72,23 @@ OMPD_FOREACH_SIZEOF(ompd_init_sizeof)
   {
     fprintf(stderr,
                 "OMP_OMPD active\n");
-    ompt_enabled = 1;
+    ompt_enabled.enabled = 1;
     ompd_state |= OMPD_ENABLE_BP;
   }
 
   ompd_initialized = 1;
 }
 
-void omp_ompd_enable ( void )
+/*void omp_ompd_enable ( void )
 {
     fprintf(stderr,
                 "OMP_OMPD active\n");
-    ompt_enabled = 1;
+    ompt_enabled.enabled = 1;
     ompd_state |= OMPD_ENABLE_BP;
 #ifdef OMPD_SUPPORT
     ompt_post_init();
 #endif
-}
+}*/
 
 void ompd_dll_locations_valid ( void ){
   /* naive way of implementing hard to opt-out empty function 

runtime/src/ompd-specific.h

@@ -73,17 +73,20 @@ OMPD_ACCESS(kmp_team_p,           t) \
 \
 OMPD_ACCESS(ompt_task_info_t,     frame) \
 OMPD_ACCESS(ompt_task_info_t,     scheduling_parent) \
-OMPD_ACCESS(ompt_task_info_t,     task_id) \
-OMPD_ACCESS(ompt_task_info_t,     function) \
+OMPD_ACCESS(ompt_task_info_t,     task_data) \
+/*OMPD_ACCESS(ompt_task_info_t,     function)*/ \
 \
-OMPD_ACCESS(ompt_team_info_t,     parallel_id) \
-OMPD_ACCESS(ompt_team_info_t,     microtask) \
+OMPD_ACCESS(ompt_team_info_t,     parallel_data) \
+/*OMPD_ACCESS(ompt_team_info_t,     microtask)*/ \
 \
 OMPD_ACCESS(ompt_thread_info_t,   state) \
 OMPD_ACCESS(ompt_thread_info_t,   wait_id) \
 \
-OMPD_ACCESS(ompt_frame_t,         reenter_runtime_frame) \
-OMPD_ACCESS(ompt_frame_t,         exit_runtime_frame) \
+OMPD_ACCESS(ompt_data_t,   value) \
+OMPD_ACCESS(ompt_data_t,   ptr) \
+\
+OMPD_ACCESS(ompt_frame_t,         exit_frame) \
+OMPD_ACCESS(ompt_frame_t,         enter_frame) \
 \
 OMPD_ACCESS(ompt_lw_taskteam_t,   parent) \
 OMPD_ACCESS(ompt_lw_taskteam_t,   ompt_team_info) \
@@ -109,8 +112,8 @@ OMPD_SIZEOF(kmp_info_t) \
 OMPD_SIZEOF(kmp_taskdata_t) \
 OMPD_SIZEOF(kmp_tasking_flags_t) \
 OMPD_SIZEOF(kmp_thread_t) \
-OMPD_SIZEOF(ompt_parallel_id_t) \
-OMPD_SIZEOF(ompt_task_id_t) \
+OMPD_SIZEOF(ompt_data_t) \
+OMPD_SIZEOF(ompt_id_t) \
 OMPD_SIZEOF(__kmp_avail_proc) \
 OMPD_SIZEOF(__kmp_max_nth) \
 OMPD_SIZEOF(__kmp_gtid) \