summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--translate.cxx5
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8d3af735..dafbf9f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-21 Josh Stone <joshua.i.stone@intel.com>
+
+ * translate.cxx (itervar::next): emit different code for pmaps
+
2005-12-21 Frank Ch. Eigler <fche@elastic.org>
* loc2c.h: Add __attribute__ defeating code for g++ 3.3 compatibility.
diff --git a/translate.cxx b/translate.cxx
index 98c6813b..bda28e8b 100644
--- a/translate.cxx
+++ b/translate.cxx
@@ -721,7 +721,10 @@ public:
if (mv.type() != referent_ty)
throw semantic_error("inconsistent iterator type in itervar::next()");
- return "_stp_map_iter (" + mv.qname() + ", " + qname() + ")";
+ if (mv.is_parallel())
+ return "_stp_map_iter (" + mv.fetch_existing_aggregate() + ", " + qname() + ")";
+ else
+ return "_stp_map_iter (" + mv.qname() + ", " + qname() + ")";
}
string qname () const