Index: trunk/BNC/src/RTCM/RTCM2Decoder.cpp
===================================================================
--- trunk/BNC/src/RTCM/RTCM2Decoder.cpp	(revision 10688)
+++ trunk/BNC/src/RTCM/RTCM2Decoder.cpp	(revision 10692)
@@ -118,7 +118,7 @@
     }
 
-    // Store message number
+    // Store _message number
     _typeList.push_back(t_typeInfo());
-    _typeList.back().type = _PP.ID();
+    _typeList.back()._type = _PP.ID();
     //_typeList.back().size = 0;
 
@@ -210,8 +210,8 @@
         _antList.push_back(t_antRefPoint());
 
-        this->getStaCrd(_antList.back().xx, _antList.back().yy, _antList.back().zz);
-
-        _antList.back().type = t_antRefPoint::APC;
-        _antList.back().message = _PP.ID();
+        this->getStaCrd(_antList.back()._xx, _antList.back()._yy, _antList.back()._zz);
+
+        _antList.back()._type = t_antRefPoint::APC;
+        _antList.back()._message = _PP.ID();
       }
     } else if (_PP.ID() == 23) {
@@ -220,11 +220,11 @@
         int serlen = strlen(_msg23.antSN.c_str());
         if ((antlen) &&
-            (_antType.empty() || strncmp(_antType.back().descriptor, _msg23.antType.c_str(), antlen) != 0)) {
+            (_antType.empty() || strncmp(_antType.back()._descriptor, _msg23.antType.c_str(), antlen) != 0)) {
           _antType.push_back(t_antInfo());
-          memcpy(_antType.back().descriptor, _msg23.antType.c_str(), antlen);
-          _antType.back().descriptor[antlen] = 0;
+          memcpy(_antType.back()._descriptor, _msg23.antType.c_str(), antlen);
+          _antType.back()._descriptor[antlen] = 0;
           if (serlen) {
-            memcpy(_antType.back().serialnumber,  _msg23.antSN.c_str(), serlen);
-            _antType.back().serialnumber[serlen] = 0;
+            memcpy(_antType.back()._serialnumber,  _msg23.antSN.c_str(), serlen);
+            _antType.back()._serialnumber[serlen] = 0;
           }
         }
@@ -234,13 +234,13 @@
         _antList.push_back(t_antRefPoint());
 
-        _antList.back().xx = _msg24.x;
-        _antList.back().yy = _msg24.y;
-        _antList.back().zz = _msg24.z;
-
-        _antList.back().height_f = true;
-        _antList.back().height = _msg24.h;
-
-        _antList.back().type = t_antRefPoint::ARP;
-        _antList.back().message = _PP.ID();
+        _antList.back()._xx = _msg24.x;
+        _antList.back()._yy = _msg24.y;
+        _antList.back()._zz = _msg24.z;
+
+        _antList.back()._height_f = true;
+        _antList.back()._height = _msg24.h;
+
+        _antList.back()._type = t_antRefPoint::ARP;
+        _antList.back()._message = _PP.ID();
       }
     }
@@ -265,5 +265,5 @@
   currentGPSWeeks(refWeek, refSecs);
 
-  // Resolve receiver time of measurement (see RTCM 2.3, page 4-42, Message 18, Note 1)
+  // Resolve receiver time of measurement (see RTCM 2.3, page 4-42, message 18, Note 1)
   // ----------------------------------------------------------------------------------
   double hoursec_est = _msg2021.hoursec();      // estimated time of measurement