Fix multinode rawiterator and CDIMM RID numbering issue

- Fixed improper rawiterator derivation from regular iterator
- Added CDIMM RID multiplier to MRW parser

Change-Id: I37cbc939eebe52da683f5a82eff1e789653afadf
RTC: 63940
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/6662
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/src/usr/targeting/common/iterators/rawtargetiterator.C b/src/usr/targeting/common/iterators/rawtargetiterator.C
index 9946a3d0f..a9912ad43 100644
--- a/src/usr/targeting/common/iterators/rawtargetiterator.C
+++ b/src/usr/targeting/common/iterators/rawtargetiterator.C
@@ -70,9 +70,10 @@ void _TargetRawIterator<T>::advance()
 
     // If cursor points to end()/NULL, do nothing.  Otherwise, check to see if
     // it should advance (possibly to NULL)
-    if(iv_pCurrent != NULL)
+    if(_TargetIterator<T>::iv_pCurrent != NULL)
     {
-        iv_pCurrent = l_targetService.getNextTarget(iv_pCurrent);
+        _TargetIterator<T>::iv_pCurrent =
+            l_targetService.getNextTarget(_TargetIterator<T>::iv_pCurrent);
     }
 }