Fix MXVC boost multiprecision issue

f4exb · Mar 28, 2024 · 8f33bad · 8f33bad
1 parent 2e9fc9d
commit 8f33bad
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/ft8/packing.cpp b/ft8/packing.cpp
@@ -934,4 +934,13 @@ bool Packing::packfree(int a77[], const std::string& msg)
     return true;
 }
 
+void Packing::pack1(int a77[], int c28_1, int c28_2, int g15, int report)
+{
+    pa64(a77, 0, 28, c28_1);
+    pa64(a77, 28+1, 28, c28_2);
+    a77[28+1+28+1] = report;
+    pa64(a77, 28+1+28+2, 15, g15);
+    pa64(a77, 28+1+28+2+15, 3, 1);
+}
+
 } // namespace FT8
diff --git a/ft8/packing.h b/ft8/packing.h
@@ -40,6 +40,7 @@ class FT8_API Packing
     static bool packcall_std(int& c28, const std::string& callstr);
     static bool packgrid(int& g15, const std::string& locstr);
     static bool packfree(int a77[], const std::string& msg);
+    static void pack1(int a77[], int c28_1, int c28_2, int g15, int report);
 
 private:
     static int ihashcall(std::string call, int m);

diff --git a/sdrbench/test_ft8protocols.cpp b/sdrbench/test_ft8protocols.cpp
@@ -34,7 +34,6 @@ void MainBench::testFT8(const QString& wavFile, const QString& argsStr)
 
 #include "ft8/ft8.h"
 #include "ft8/packing.h"
-#include "ft8/pack0.h"
 
 class TestFT8Protocols
 {
@@ -122,13 +121,7 @@ void TestFT8Protocols::testMsg1(const QStringList& argElements, bool runLDPC)
 
     int a77[77];
     std::fill(a77, a77 + 77, 0);
-
-    FT8::pa64(a77, 0, 28, c28_1);
-    FT8::pa64(a77, 28+1, 28, c28_2);
-    a77[28+1+28+1] = report;
-    FT8::pa64(a77, 28+1+28+2, 15, g15);
-    FT8::pa64(a77, 28+1+28+2+15, 3, 1);
-
+    FT8::Packing::pack1(a77, c28_1, c28_2, g15, report);
     FT8::Packing packing;
 
     std::string call1, call2, loc;