Index: trunk/BNC/RTCM/GPSDecoder.h
===================================================================
--- trunk/BNC/RTCM/GPSDecoder.h	(revision 2678)
+++ trunk/BNC/RTCM/GPSDecoder.h	(revision 2679)
@@ -38,27 +38,36 @@
  public:
 
-  t_obsInternal() : 
-    flags(0),
-    satSys(' '),
-    satNum(0),
-    slotNum(0),
-    GPSWeek(0),
-    GPSWeeks(0.0),
-    C1(0.0),
-    C2(0.0),
-    P1(0.0),
-    P2(0.0),
-    L1(0.0),
-    L2(0.0),
-    slip_cnt_L1(-1),
-    slip_cnt_L2(-1),
-    lock_timei_L1(-1),
-    lock_timei_L2(-1),
-    S1(0.0),
-    S2(0.0),
-    SNR1(0),
-    SNR2(0) {
-    StatID[0] = '\x0';
+  t_obsInternal() {
+    flags         = 0;
+    satSys        = 'G';
+    satNum        = 0;
+    slotNum       = 0;
+    GPSWeek       = 0;
+    GPSWeeks      = 0.0;
+    C1            = 0.0;
+    C2            = 0.0;
+    C5            = 0.0;
+    P1            = 0.0;
+    P2            = 0.0;
+    L1            = 0.0;
+    L2            = 0.0;
+    L5            = 0.0;
+    slip_cnt_L1   = -1;
+    slip_cnt_L2   = -1;
+    slip_cnt_L5   = -1;
+    lock_timei_L1 = -1;
+    lock_timei_L2 = -1;
+    lock_timei_L5 = -1;
+    S1            = 0.0;
+    S2            = 0.0;
+    S5            = 0.0;
+    SNR1          = 0;
+    SNR2          = 0;
+    SNR5          = 0;
+    StatID[0]     = '\x0';
   }
+
+  ~t_obsInternal() {}
+
   int    flags;
   char   StatID[20+1];  // Station ID
@@ -70,16 +79,22 @@
   double C1;            // CA-code pseudorange (meters)
   double C2;            // CA-code pseudorange (meters)
+  double C5;
   double P1;            // P1-code pseudorange (meters)
   double P2;            // P2-code pseudorange (meters)
   double L1;            // L1 carrier phase (cycles)
   double L2;            // L2 carrier phase (cycles)
+  double L5;            // L5 carrier phase (cycles)
   int    slip_cnt_L1;   // L1 cumulative loss of continuity indicator (negative value = undefined)
   int    slip_cnt_L2;   // L2 cumulative loss of continuity indicator (negative value = undefined)
+  int    slip_cnt_L5;   // L5 cumulative loss of continuity indicator (negative value = undefined)
   int    lock_timei_L1; // L1 last lock time indicator                (negative value = undefined)
   int    lock_timei_L2; // L2 last lock time indicator                (negative value = undefined)
+  int    lock_timei_L5; // L5 last lock time indicator                (negative value = undefined)
   double S1;            // L1 signal-to noise ratio
   double S2;            // L2 signal-to noise ratio
+  double S5;            // L5 signal-to noise ratio
   int    SNR1;          // L1 signal-to noise ratio (mapped to integer)
   int    SNR2;          // L2 signal-to noise ratio (mapped to integer)
+  int    SNR5;          // L5 signal-to noise ratio (mapped to integer)
 };
 
@@ -87,33 +102,8 @@
  public:
   enum t_obs_status {initial, posted, received};
-
   t_obs() {
     _status = initial;
-
-    _o.flags         = 0;
-    _o.StatID[0]     = '\0';
-    _o.satSys        = 'G';
-    _o.satNum        = 0;
-    _o.slotNum       = 0;
-    _o.GPSWeek       = 0;
-    _o.GPSWeeks      = 0.0;
-    _o.C1            = 0.0;
-    _o.C2            = 0.0;
-    _o.P1            = 0.0;
-    _o.P2            = 0.0;
-    _o.L1            = 0.0;
-    _o.L2            = 0.0;
-    _o.S1            = 0.0;
-    _o.S2            = 0.0;
-    _o.slip_cnt_L1   = -1;
-    _o.slip_cnt_L2   = -1;
-    _o.lock_timei_L1 = -1;
-    _o.lock_timei_L2 = -1;
-    _o.SNR1          = 0;
-    _o.SNR2          = 0;
   }
-
   ~t_obs() {}
-
   t_obsInternal _o;
   t_obs_status  _status;