Changeset 10914 in ntrip

Timestamp:

May 5, 2026, 10:12:35 PM (7 days ago)

Author:

stuerze

Message:

minor changes to solve windows error C2872: 'byte': ambiguous symbol

Location:

trunk/BNC/src

Files:

• bnccaster.cpp (modified) (1 diff)
• bncmain.cpp (modified) (1 diff)
• bncwindow.cpp (modified) (1 diff)
• combination/bnccomb.h (modified) (1 diff)
• latencychecker.cpp (modified) (1 diff)
• serial/win_qextserialport.h (modified) (1 diff)
• src.pri (modified) (1 diff)
• test_serial.cpp (modified) (1 diff)

trunk/BNC/src/bnccaster.cpp

@@ -42 +42 @@
 #include <unistd.h>
 #else
-#define _HAS_STD_BYTE 0
 #include <windows.h>
 #endif

trunk/BNC/src/bncmain.cpp

@@ -42 +42 @@
 #include <unistd.h>
 #else
-#define _HAS_STD_BYTE 0
 #include <windows.h>
 #endif

trunk/BNC/src/bncwindow.cpp

@@ -41 +41 @@
 #include <unistd.h>
 #else
-#define _HAS_STD_BYTE 0
 #include <windows.h>
 #endif

trunk/BNC/src/combination/bnccomb.h

@@ -6 +6 @@
 #include <unistd.h>
 #else
-#define _HAS_STD_BYTE 0
 #include <windows.h>
 #endif

trunk/BNC/src/latencychecker.cpp

@@ -40 +40 @@
 
 #ifdef WIN32
-#define _HAS_STD_BYTE 0
 #include <windows.h>
 #else

trunk/BNC/src/serial/win_qextserialport.h

@@ -8 +8 @@
 #define _TTY_NOWARN_PORT_
 #endif
-#define _HAS_STD_BYTE 0
+#ifdef WIN32
 #include <windows.h>
+#endif
+
 
 class Win_QextSerialPort:public QextSerialBase {

trunk/BNC/src/src.pri

@@ -2 +2 @@
 unix:DEFINES  += _TTY_POSIX_
 win32:DEFINES += _TTY_WIN_
+
+# to solve error C2872: 'byte': ambiguous symbol
+# in C++17 type std::byte is introduced
+# in Windows SDK byte is defined via typedef unsigned char byte
+win32:DEFINES += _HAS_STD_BYTE 0
 
 RESOURCES += bnc.qrc

trunk/BNC/src/test_serial.cpp

@@ -3 +3 @@
 #include <unistd.h>
 #else
-#define _HAS_STD_BYTE 0
 #include <windows.h>
 #endif