fix #755 boost 1.80 support (#758)

nelson-lang · Oct 16, 2022 · 0896635 · 0896635
1 parent a837bdd
commit 0896635
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 - [#739](http://github.com/Nelson-numerical-software/nelson/issues/739): special case with empty cell.
 
+### Changed
+
+- [#755](http://github.com/Nelson-numerical-software/nelson/issues/755): Boost 1.80 support (default on Windows)
+
 ## 0.6.9 (2022-09-28)
 
 ### Added

diff --git a/bin/bin.iss b/bin/bin.iss
@@ -7,7 +7,7 @@
 ; SPDX-License-Identifier: LGPL-3.0-or-later
 ; LICENCE_BLOCK_END
 ;==============================================================================
-; Boost 1.78
+; Boost 1.80
 ;==============================================================================
 Source: {#RootPath}bin\{#BinPath}\boost_chrono-{#BOOST_TARGET}.dll; DestDir: {app}\bin\{#BinPath}\; Components: {#COMPONENT_NELSON};
 Source: {#RootPath}bin\{#BinPath}\boost_date_time-{#BOOST_TARGET}.dll; DestDir: {app}\bin\{#BinPath}\; Components: {#COMPONENT_NELSON};

diff --git a/modules/types/src/include/nlsConfig.h.in b/modules/types/src/include/nlsConfig.h.in
@@ -65,15 +65,15 @@
 #ifdef _MSC_VER
 #ifdef _DEBUG
 #ifdef _WIN64
-#define BOOST_TARGET "vc143-mt-gd-x64-1_78"
+#define BOOST_TARGET "vc143-mt-gd-x64-1_80"
 #else
-#define BOOST_TARGET "vc143-mt-gd-x32-1_78"
+#define BOOST_TARGET "vc143-mt-gd-x32-1_80"
 #endif
 #else
 #ifdef _WIN64
-#define BOOST_TARGET "vc143-mt-x64-1_78"
+#define BOOST_TARGET "vc143-mt-x64-1_80"
 #else
-#define BOOST_TARGET "vc143-mt-x32-1_78"
+#define BOOST_TARGET "vc143-mt-x32-1_80"
 #endif
 #endif
 #endif

diff --git a/modules/types/src/include/nlsConfig.h.vc b/modules/types/src/include/nlsConfig.h.vc
@@ -65,15 +65,15 @@
 #ifdef _MSC_VER
 #ifdef _DEBUG
 #ifdef _WIN64
-#define BOOST_TARGET "vc143-mt-gd-x64-1_78"
+#define BOOST_TARGET "vc143-mt-gd-x64-1_80"
 #else
-#define BOOST_TARGET "vc143-mt-gd-x32-1_78"
+#define BOOST_TARGET "vc143-mt-gd-x32-1_80"
 #endif
 #else
 #ifdef _WIN64
-#define BOOST_TARGET "vc143-mt-x64-1_78"
+#define BOOST_TARGET "vc143-mt-x64-1_80"
 #else
-#define BOOST_TARGET "vc143-mt-x32-1_78"
+#define BOOST_TARGET "vc143-mt-x32-1_80"
 #endif
 #endif
 #endif

diff --git a/tools/innosetup/Nelson.iss b/tools/innosetup/Nelson.iss
@@ -27,15 +27,15 @@
 #endif
 #ifdef NELSON_X64
 #ifdef NELSON_DEBUG
-#define BOOST_TARGET  "vc143-mt-gd-x64-1_78"
+#define BOOST_TARGET  "vc143-mt-gd-x64-1_80"
 #else
-#define BOOST_TARGET  "vc143-mt-x64-1_78"
+#define BOOST_TARGET  "vc143-mt-x64-1_80"
 #endif
 #else
 #ifdef NELSON_DEBUG
-#define BOOST_TARGET  "vc143-mt-gd-x32-1_78"
+#define BOOST_TARGET  "vc143-mt-gd-x32-1_80"
 #else
-#define BOOST_TARGET  "vc143-mt-x32-1_78"
+#define BOOST_TARGET  "vc143-mt-x32-1_80"
 #endif
 #endif
 ;==============================================================================