fix #503 Boost 1.77 support

nelson-lang · Aug 31, 2021 · 7f2ae0a · 7f2ae0a
1 parent 1a26473
commit 7f2ae0a
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@
 
 - [#496](http://github.com/Nelson-numerical-software/nelson/issues/496): Eigen 3.4 used.
 
+- [#503](http://github.com/Nelson-numerical-software/nelson/issues/503): Boost 1.77 support (default on Windows).
+
+
 # 0.5.8 (2021-08-25)
 
 ## Features:

diff --git a/bin/bin.iss b/bin/bin.iss
@@ -25,7 +25,7 @@
 ;==============================================================================
 Source: {#RootPath}bin\{#BinPath}\readme.txt; DestDir: {app}\bin\{#BinPath}\
 ;==============================================================================
-; Boost 1.71
+; Boost 1.77
 ;==============================================================================
 Source: {#RootPath}bin\{#BinPath}\boost_chrono-{#BOOST_TARGET}.dll; DestDir: {app}\bin\{#BinPath}\;
 Source: {#RootPath}bin\{#BinPath}\boost_date_time-{#BOOST_TARGET}.dll; DestDir: {app}\bin\{#BinPath}\;

diff --git a/modules/files_folders_functions/src/include/RemoveDirectory.hpp b/modules/files_folders_functions/src/include/RemoveDirectory.hpp
@@ -25,8 +25,10 @@
 //=============================================================================
 #pragma once
 //=============================================================================
-#include "nlsFiles_folders_functions_exports.h"
 #include <string>
+#include "nlsFiles_folders_functions_exports.h"
+//=============================================================================
+#undef RemoveDirectory
 //=============================================================================
 namespace Nelson {
 NLSFILES_FOLDERS_FUNCTIONS_IMPEXP bool

diff --git a/modules/help_browser/src/cpp/HelpBrowser.cpp b/modules/help_browser/src/cpp/HelpBrowser.cpp
@@ -236,7 +236,7 @@ HelpBrowser::clearCache()
     closeBrowser();
     std::wstring cachePath = getCachePath();
     std::wstring msgError = L"";
-    Nelson::RemoveDirectory(cachePath, true, msgError);
+    RemoveDirectory(cachePath, true, msgError);
 }
 //=============================================================================
 std::wstring

diff --git a/modules/mex/src/cpp/Engine.cpp b/modules/mex/src/cpp/Engine.cpp
@@ -30,6 +30,7 @@
 //=============================================================================
 #include <string>
 #include <stdlib.h>
+#include <algorithm>
 #include <boost/process.hpp>
 #include <boost/thread/thread.hpp>
 #include <boost/process/async.hpp>

diff --git a/modules/text_completion/src/cpp/FileCompleter.cpp b/modules/text_completion/src/cpp/FileCompleter.cpp
@@ -23,12 +23,13 @@
 // License along with this program. If not, see <http://www.gnu.org/licenses/>.
 // LICENCE_BLOCK_END
 //=============================================================================
-#include "FileCompleter.hpp"
+#include <algorithm>
 #include <boost/algorithm/string.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/convenience.hpp>
 #include <boost/filesystem/operations.hpp>
 #include <boost/regex.hpp>
+#include "FileCompleter.hpp"
 //=============================================================================
 namespace Nelson {
 //=============================================================================
@@ -165,7 +166,7 @@ FileCompleter(const std::wstring& prefix)
                                     size_t pos1 = prefix.rfind(L'/');
                                     size_t pos2 = prefix.rfind(L'\\');
                                     if (pos1 != std::wstring::npos && pos2 != std::wstring::npos) {
-                                        pos = std::max(pos1, pos2);
+                                        pos = max(pos1, pos2);
                                     } else {
                                         if (pos1 != std::wstring::npos) {
                                             pos = pos1;

diff --git a/modules/types/src/include/nlsConfig.h b/modules/types/src/include/nlsConfig.h
@@ -42,15 +42,15 @@
 #ifdef _MSC_VER
 #ifdef _DEBUG
 #ifdef _WIN64
-#define BOOST_TARGET "vc142-mt-gd-x64-1_75"
+#define BOOST_TARGET "vc142-mt-gd-x64-1_77"
 #else
-#define BOOST_TARGET "vc142-mt-gd-x32-1_75"
+#define BOOST_TARGET "vc142-mt-gd-x32-1_77"
 #endif
 #else
 #ifdef _WIN64
-#define BOOST_TARGET "vc142-mt-x64-1_75"
+#define BOOST_TARGET "vc142-mt-x64-1_77"
 #else
-#define BOOST_TARGET "vc142-mt-x32-1_75"
+#define BOOST_TARGET "vc142-mt-x32-1_77"
 #endif
 #endif
 #endif

diff --git a/tools/innosetup/Nelson.iss b/tools/innosetup/Nelson.iss
@@ -43,15 +43,15 @@
 #endif
 #ifdef NELSON_X64
 #ifdef NELSON_DEBUG
-#define BOOST_TARGET  "vc142-mt-gd-x64-1_75"
+#define BOOST_TARGET  "vc142-mt-gd-x64-1_77"
 #else
-#define BOOST_TARGET  "vc142-mt-x64-1_75"
+#define BOOST_TARGET  "vc142-mt-x64-1_77"
 #endif
 #else
 #ifdef NELSON_DEBUG
-#define BOOST_TARGET  "vc142-mt-gd-x32-1_75"
+#define BOOST_TARGET  "vc142-mt-gd-x32-1_77"
 #else
-#define BOOST_TARGET  "vc142-mt-x32-1_75"
+#define BOOST_TARGET  "vc142-mt-x32-1_77"
 #endif
 #endif
 ;==============================================================================