summaryrefslogtreecommitdiff
path: root/DAnCE/tools
diff options
context:
space:
mode:
authorWilliam R. Otte <wotte@dre.vanderbilt.edu>2011-10-25 17:31:15 +0000
committerWilliam R. Otte <wotte@dre.vanderbilt.edu>2011-10-25 17:31:15 +0000
commit1e76dcc641b92de5cb270074d8d254a017f48d7e (patch)
tree24ee7f3e50404012061078a736f2b7615b069f70 /DAnCE/tools
parentce6ff3bca0b93dcdb50d9525fcb3ccd16e8adc92 (diff)
downloadATCD-1e76dcc641b92de5cb270074d8d254a017f48d7e.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.
Diffstat (limited to 'DAnCE/tools')
-rw-r--r--DAnCE/tools/Split_Plan/Split_Plan.cpp8
1 files changed, 6 insertions, 2 deletions
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;