Index: /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit.h
===================================================================
--- /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit.h	(revision 9193)
+++ /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit.h	(revision 9194)
@@ -404,18 +404,4 @@
   virtual CodeType    rnxTypeToCodeType(char system, std::string type) = 0;
 
-  static uint32_t CRC24(long size, const unsigned char *buf) {
-    uint32_t crc = 0;
-    int ii;
-    while (size--) {
-      crc ^= (*buf++) << (16);
-      for (ii = 0; ii < 8; ii++)  {
-        crc <<= 1;
-        if (crc & 0x1000000)
-          crc ^= 0x01864cfb;
-      }
-    }
-    return crc;
-  }
-
 //#ifndef NOENCODE
 #define STOREBITS \
@@ -454,5 +440,5 @@
     if(len > 1023) \
       return 0; \
-    len = SsrCorr::CRC24(len+3, (const unsigned char *) blockstart); \
+    len = CRC24(len+3, (const unsigned char *) blockstart); \
     ADDBITS(24, len) \
   }
@@ -532,4 +518,17 @@
 #define T_VTEC_QUALITY_INDICATOR(a)      SCALEADDBITS( 9,       20.0, a) /* DF478, IDF041 */
 
+static uint32_t CRC24(long size, const unsigned char *buf) {
+  uint32_t crc = 0;
+  int ii;
+  while (size--) {
+    crc ^= (*buf++) << (16);
+    for (ii = 0; ii < 8; ii++)  {
+      crc <<= 1;
+      if (crc & 0x1000000)
+        crc ^= 0x01864cfb;
+    }
+  }
+  return crc;
+}
 
 static double URAToValue(int ura) {