From 7f2ae0afca834143b33b9fe4bbda148d50dd6e36 Mon Sep 17 00:00:00 2001 From: Allan CORNET Date: Tue, 31 Aug 2021 20:32:06 +0200 Subject: [PATCH] fix #503 Boost 1.77 support --- CHANGELOG.md | 3 +++ bin/bin.iss | 2 +- .../src/include/RemoveDirectory.hpp | 4 +++- modules/help_browser/src/cpp/HelpBrowser.cpp | 2 +- modules/mex/src/cpp/Engine.cpp | 1 + modules/text_completion/src/cpp/FileCompleter.cpp | 5 +++-- modules/types/src/include/nlsConfig.h | 8 ++++---- tools/innosetup/Nelson.iss | 8 ++++---- 8 files changed, 20 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa777d2456..3cede9df9f 100644 --- 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 index f7b02c62f5..ee1f04840f 100644 --- 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 index bdc3677e6a..f8fb5aacb7 100644 --- 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 +#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 index 8377291858..b487938ab5 100644 --- 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 index 56591033a7..b25b8063be 100644 --- a/modules/mex/src/cpp/Engine.cpp +++ b/modules/mex/src/cpp/Engine.cpp @@ -30,6 +30,7 @@ //============================================================================= #include #include +#include #include #include #include diff --git a/modules/text_completion/src/cpp/FileCompleter.cpp b/modules/text_completion/src/cpp/FileCompleter.cpp index ec75d948cc..ef4c585f0b 100644 --- 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 . // LICENCE_BLOCK_END //============================================================================= -#include "FileCompleter.hpp" +#include #include #include #include #include #include +#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 index 21f022d168..4ed358de5a 100644 --- 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 index cbd4e63695..291ca72ce1 100644 --- 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 ;==============================================================================