Changeset 5805 in ntrip

Timestamp:

Aug 6, 2014, 10:40:34 AM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• PPP/pppModel.cpp (modified) (2 diffs)
• PPP/pppModel.h (modified) (2 diffs)
• bncantex.cpp (modified) (1 diff)
• bncmodel.cpp (modified) (1 diff)
• bncmodel.h (modified) (2 diffs)
• combination/bnccomb.cpp (modified) (1 diff)

trunk/BNC/src/PPP/pppModel.cpp

@@ -5 +5 @@
 #include "bncutils.h"
 
+using namespace BNC;
 using namespace std;
 
@@ -234 +235 @@
     ColumnVector sz = -rSat / rSat.norm_Frobenius();
 
-    ColumnVector xSun = Sun(etime.mjddec());
+    ColumnVector xSun = t_astro::Sun(etime.mjddec());
     xSun /= xSun.norm_Frobenius();
 

trunk/BNC/src/PPP/pppModel.h

@@ -4 +4 @@
 #include <newmat.h>
 #include "bnctime.h"
+#include "t_prn.h"
+
+namespace BNC {
 
 class t_astro {
@@ -50 +53 @@
 };
 
+}
+
 #endif

trunk/BNC/src/bncantex.cpp

@@ -45 +45 @@
 #include "PPP/pppModel.h"
 
+using namespace BNC;
 using namespace std;
 

trunk/BNC/src/bncmodel.cpp

@@ -54 +54 @@
 #include "pppopt.h"
 
+using namespace BNC;
 using namespace std;
 

trunk/BNC/src/bncmodel.h

@@ -38 +38 @@
 class t_pppOpt;
 class bncPPPclient;
+namespace BNC {
 class t_tides;
+}
 
 class bncParam {
@@ -165 +167 @@
   QStringList           _outlierGlo;
   bncAntex*             _antex;
-  t_tides*              _tides;
+  BNC::t_tides*         _tides;
 };
 

trunk/BNC/src/combination/bnccomb.cpp

@@ -28 +28 @@
 #include "bncsp3.h"
 #include "bncantex.h"
-#include "bnctides.h"
 #include "t_prn.h"