Changeset 4018 in ntrip for trunk/BNC/bncephuser.cpp

Timestamp:

Apr 22, 2012, 6:50:49 PM (12 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/bncephuser.cpp (modified) (3 diffs)

trunk/BNC/bncephuser.cpp

@@ -81 +81 @@
   if (_eph.contains(prn)) {
     t_ephGPS* eLast = static_cast<t_ephGPS*>(_eph.value(prn)->last);
-    if ( (eLast->GPSweek() <  gpseph.GPSweek) || 
-         (eLast->GPSweek() == gpseph.GPSweek &&  
-          eLast->TOC()     <  gpseph.TOC) ) {
+    bncTime toc(gpseph.GPSweek, gpseph.TOC);
+    if (eLast->TOC() < toc) {
       delete static_cast<t_ephGPS*>(_eph.value(prn)->prev);
       _eph.value(prn)->prev = _eph.value(prn)->last;
@@ -110 +109 @@
     updatetime(&ww, &tow, gloeph.tb*1000, 0);  // Moscow -> GPS
     t_ephGlo* eLast = static_cast<t_ephGlo*>(_eph.value(prn)->last);
-    if (eLast->GPSweek() < ww || 
-        (eLast->GPSweek()  == ww &&  eLast->GPSweeks() <  tow)) {  
+    bncTime toc(ww, tow);
+    if (eLast->TOC() < toc) {
       delete static_cast<t_ephGlo*>(_eph.value(prn)->prev);
       _eph.value(prn)->prev = _eph.value(prn)->last;
@@ -135 +134 @@
   if (_eph.contains(prn)) {
     t_ephGal* eLast = static_cast<t_ephGal*>(_eph.value(prn)->last);
-    if ( (eLast->GPSweek() <  galeph.Week) || 
-         (eLast->GPSweek() == galeph.Week &&  
-          eLast->TOC()     <  galeph.TOC) ) {
+    bncTime toc(galeph.Week, galeph.TOC);
+    if (eLast->TOC() < toc) {
       delete static_cast<t_ephGal*>(_eph.value(prn)->prev);
       _eph.value(prn)->prev = _eph.value(prn)->last;