Merge pull request #7 from srogatch/users/srogatch/fix/C++20

jdart1 · web-flow · commit c3e6e3f89d47 · 2022-11-26T09:43:12.000-08:00
Fix the compilation for C++20
diff --git a/src/tbprobe.c b/src/tbprobe.c
@@ -39,10 +39,6 @@ SOFTWARE.
 #endif
 #include "tbprobe.h"
 
-#ifdef __cplusplus
-using namespace std;
-#endif
-
 #define TB_PIECES 7
 #define TB_HASHBITS  (TB_PIECES < 7 ?  11 : 12)
 #define TB_MAX_PIECE (TB_PIECES < 7 ? 254 : 650)
@@ -70,6 +66,13 @@ typedef size_t map_t;
 typedef HANDLE map_t;
 #endif
 
+// This must be after the inclusion of Windows headers, because otherwise
+// std::byte conflicts with "byte" in rpcndr.h . The error occurs if C++
+// standard is at lest 17, as std::byte was introduced in C++17.
+#ifdef __cplusplus
+using namespace std;
+#endif
+
 #define DECOMP64
 
 // Threading support
