Skip to content

Commit 503be83

Browse files
committed
Merge branch 'develop'
2 parents e80fde0 + 252f31b commit 503be83

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
branches:
1111
- master
1212
- develop
13+
- feature/**
1314
pull_request:
1415
release:
1516
types: [published, created, edited]

include/boost/config/auto_link.hpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,11 +187,16 @@ BOOST_LIB_SUFFIX: Static/import libraries extension (".lib", ".a") for the c
187187
// vc14.2:
188188
# define BOOST_LIB_TOOLSET "vc142"
189189

190-
# elif defined(BOOST_MSVC)
190+
# elif defined(BOOST_MSVC) && (BOOST_MSVC < 1950)
191191

192192
// vc14.3:
193193
# define BOOST_LIB_TOOLSET "vc143"
194194

195+
# elif defined(BOOST_MSVC)
196+
197+
// vc14.5:
198+
# define BOOST_LIB_TOOLSET "vc145"
199+
195200
# elif defined(BOOST_EMBTC_WINDOWS)
196201

197202
// Embarcadero Clang based compilers:

include/boost/config/compiler/visualc.hpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,8 @@
374374
# define BOOST_COMPILER_VERSION 14.2
375375
# elif _MSC_VER < 1950
376376
# define BOOST_COMPILER_VERSION 14.3
377+
# elif _MSC_VER < 1960
378+
# define BOOST_COMPILER_VERSION 14.5
377379
# else
378380
# define BOOST_COMPILER_VERSION _MSC_VER
379381
# endif
@@ -385,8 +387,8 @@
385387
#include <boost/config/pragma_message.hpp>
386388

387389
//
388-
// last known and checked version is 19.4x (VS2022):
389-
#if (_MSC_VER >= 1950)
390+
// last known and checked version is 19.5x (VS2026):
391+
#if (_MSC_VER >= 1960)
390392
# if defined(BOOST_ASSERT_CONFIG)
391393
# error "Boost.Config is older than your current compiler version."
392394
# elif !defined(BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE)

0 commit comments

Comments
 (0)