Changeset 9962 in ntrip for trunk/BNC/src/RTCM3

Timestamp:

Jan 26, 2023, 12:19:20 PM (22 months ago)

Author:

stuerze

Message:

minor changes to be msvc compatible

Location:

trunk/BNC/src/RTCM3/clock_and_orbit

Files:

• clock_orbit_igs.cpp (modified) (2 diffs)
• clock_orbit_rtcm.cpp (modified) (1 diff)

trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_igs.cpp

@@ -21 +21 @@
 size_t SsrCorrIgs::MakeClockOrbit(const struct ClockOrbit *co, ClockOrbitType type,
     int moremessagesfollow, char *buffer, size_t size) {
-
-  unsigned int status[CLOCKORBIT_SATNUM][COBOFS_NUM], i, s;
-
-  memset(status, 0, sizeof(status));
+  std::vector< std::vector<unsigned int> > status(CLOCKORBIT_SATNUM, std::vector<unsigned int>(COBOFS_NUM));
+  unsigned int i, s;
+
+  //memset(status, 0, sizeof(status));
 
   STARTDATA
@@ -89 +89 @@
     if (status[s][COBOFS_COMBINED]) {
 #ifdef SPLITBLOCK
-      int nums = co->NumberOfSat[s];
-      int left, start = satoffset[s];
+      unsigned int nums = co->NumberOfSat[s];
+      unsigned int left, start = satoffset[s];
       if(nums > 28) {/* split block when more than 28 sats */
         left = nums - 28;

trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.cpp

@@ -21 +21 @@
 size_t SsrCorrRtcm::MakeClockOrbit(const struct ClockOrbit *co, ClockOrbitType type,
     int moremessagesfollow, char *buffer, size_t size) {
-  unsigned int status[CLOCKORBIT_SATNUM][COBOFS_NUM], i, s;
-
-  memset(status, 0, sizeof(status));
+  std::vector< std::vector<unsigned int> > status(CLOCKORBIT_SATNUM, std::vector<unsigned int>(COBOFS_NUM));
+  unsigned int i, s;
+
+  //memset(status, 0, sizeof(status));
 
   STARTDATA