Changeset 6139 in ntrip for trunk

Timestamp:

Sep 13, 2014, 12:47:07 PM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• RTCM/RTCM2Decoder.h (modified) (1 diff)
• RTCM/rtcm_utils.cpp (modified) (1 diff)
• RTCM3/ephEncoder.cpp (modified) (1 diff)
• bncephuser.h (modified) (1 diff)
• bncgetthread.h (modified) (1 diff)
• bncrinex.cpp (modified) (1 diff)
• ephemeris.h (modified) (1 diff)
• upload/bncrtnetuploadcaster.cpp (modified) (1 diff)

trunk/BNC/src/RTCM/RTCM2Decoder.h

@@ -33 +33 @@
 #include "RTCM2.h"
 #include "RTCM2_2021.h"
-#include "rtcm3torinex.h"
 #include "ephemeris.h"
 #include "bncephuser.h"

trunk/BNC/src/RTCM/rtcm_utils.cpp

@@ -3 +3 @@
 #include <math.h>
 #include <stdio.h>
-#include <rtcm3torinex.h>
-#include <ephemeris.h>
 
 #include "rtcm_utils.h"
+#include "ephemeris.h"
 
 using namespace std;

trunk/BNC/src/RTCM3/ephEncoder.cpp

@@ -1 +1 @@
 
 #include "ephEncoder.h"
+
+extern "C" {
+#  include "rtcm3torinex.h"
+}
+
 using namespace std;
 

trunk/BNC/src/bncephuser.h

@@ -34 +34 @@
 
 extern "C" {
-#include "clock_orbit_rtcm.h"
+#  include "clock_orbit_rtcm.h"
 }
 

trunk/BNC/src/bncgetthread.h

@@ -31 +31 @@
 #include <QFile>
 
-#include "rtcm3torinex.h"
 #include "bncconst.h"
 #include "bncnetquery.h"

trunk/BNC/src/bncrinex.cpp

@@ -59 +59 @@
 #include "bncsettings.h"
 #include "bncversion.h"
-#include "rtcm3torinex.h"
 
 using namespace std;

trunk/BNC/src/ephemeris.h

@@ -9 +9 @@
 #include "bncconst.h"
 #include "t_prn.h"
+
 extern "C" {
-#include "rtcm3torinex.h"
+#  include "rtcm3torinex.h"
 }
 

trunk/BNC/src/upload/bncrtnetuploadcaster.cpp

@@ -21 +21 @@
 #include "bncclockrinex.h"
 #include "bncsp3.h"
+
+extern "C" {
+#  include "rtcm3torinex.h"
+}
 
 using namespace std;