diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2011-10-25 17:31:15 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2011-10-25 17:31:15 +0000 |
| commit | 40988af8a35ee25a9e278147edf3a516cf7f217c (patch) | |
| tree | 24ee7f3e50404012061078a736f2b7615b069f70 | |
| parent | e0f2df0eca0f592a5ee0ea7b31216b6df6503b73 (diff) | |
| download | ATCD-40988af8a35ee25a9e278147edf3a516cf7f217c.tar.gz | |
Tue Oct 25 17:30:32 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu>
* tools/Split_Plan/Split_Plan.cpp:
Moved openmp for loops inside __OPENMP ifdef, else we use
CORBA::ULong types for loop index.
| -rw-r--r-- | DAnCE/ChangeLog | 7 | ||||
| -rw-r--r-- | DAnCE/tools/Split_Plan/Split_Plan.cpp | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/DAnCE/ChangeLog b/DAnCE/ChangeLog index b367bca3229..adb0bafde69 100644 --- a/DAnCE/ChangeLog +++ b/DAnCE/ChangeLog @@ -1,3 +1,10 @@ +Tue Oct 25 17:30:32 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> + + * tools/Split_Plan/Split_Plan.cpp: + + Moved openmp for loops inside __OPENMP ifdef, else we use + CORBA::ULong types for loop index. + Tue Oct 25 17:29:44 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> * tools/Domain_Validator/CORBA/CORBA_Domain_Validator.mpc: diff --git a/DAnCE/tools/Split_Plan/Split_Plan.cpp b/DAnCE/tools/Split_Plan/Split_Plan.cpp index 748dba71586..286ca28ecce 100644 --- a/DAnCE/tools/Split_Plan/Split_Plan.cpp +++ b/DAnCE/tools/Split_Plan/Split_Plan.cpp @@ -161,8 +161,10 @@ namespace DAnCE #ifdef _OPENMP #pragma omp parallel for -#endif for (int i = 0; i < static_cast<int> (sub_plan_list.size ()); ++i) +#else + for (CORBA::ULong i = 0; i < sub_plan_list.size (); ++i) +#endif { // get the sub plan and key for current instance TSubPlanKey& sub_plan_key = sub_plan_list[i].first; @@ -185,8 +187,10 @@ namespace DAnCE // one by one. #ifdef _OPENMP #pragma omp parallel for -#endif for (int i = 0; i < static_cast <int> (sub_plan_list.size ()); ++i) +#else + for (CORBA::ULong i = 0; i < (sub_plan_list.size ()); ++i) +#endif { // get the sub plan and key for current instance TSubPlanKey& sub_plan_key = sub_plan_list[i].first; |