Changeset 5819 in ntrip for trunk/BNC/src/PPP/pppThread.cpp

Timestamp:

Aug 6, 2014, 1:02:08 PM (10 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/PPP/pppThread.cpp (modified) (4 diffs)

trunk/BNC/src/PPP/pppThread.cpp

@@ -171 +171 @@
   while (it.hasNext()) {
     const t_obs& oldObs = it.next();
-    t_pppSatObs* newObs = new t_pppSatObs;
+    t_satObs* newObs = new t_satObs;
    
     newObs->_prn.set(oldObs.satSys, oldObs.satNum);
@@ -198 +198 @@
     if (epoData != 0) {
       epoData->_pppSatObs.push_back(newObs);
-      map<string, t_pppObs*> pppObsMap;
+      map<string, t_frqObs*> pppObsMap;
       for (unsigned iEntry = 0; iEntry < GNSSENTRY_NUMBER; iEntry++) {
         string hlp(oldObs.rnxStr(iEntry).toAscii().data());
@@ -205 +205 @@
           string rnxType2ch = hlp.substr(1);
           if (obsType == 'C' || obsType == 'L') {
-            t_pppObs* pppObs = 0;
+            t_frqObs* pppObs = 0;
             if (pppObsMap.find(rnxType2ch) == pppObsMap.end()) {
-              pppObs                = new t_pppObs();
+              pppObs                = new t_frqObs();
               pppObsMap[rnxType2ch] = pppObs;
               pppObs->_rnxType2ch   = rnxType2ch;
@@ -233 +233 @@
   if (_pppEpochs.size() > 1) {
 
-    const vector<t_pppSatObs*>& pppSatObs = _pppEpochs.front()->_pppSatObs;
+    const vector<t_satObs*>& pppSatObs = _pppEpochs.front()->_pppSatObs;
 
     t_output output;