Skip to content

Commit 225ffed

Browse files
committed
Enforces intel icpc >= 2017, fixes pybind#1121
1 parent 060936f commit 225ffed

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ In addition to the core functionality, pybind11 provides some extra goodies:
9898
1. Clang/LLVM 3.3 or newer (for Apple Xcode's clang, this is 5.0.0 or newer)
9999
2. GCC 4.8 or newer
100100
3. Microsoft Visual Studio 2015 Update 3 or newer
101-
4. Intel C++ compiler 16 or newer (15 with a [workaround](https://github.com/pybind/pybind11/issues/276))
101+
4. Intel C++ compiler 17 or newer (16 with pybind11 v2.0 and 15 with pybind11 v2.0 and a [workaround](https://github.com/pybind/pybind11/issues/276))
102102
5. Cygwin/GCC (tested on 2.5.1)
103103

104104
## About

docs/changelog.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ v2.3.0 (Not yet released)
2121
* The ``value()`` method of ``py::enum_`` now accepts an optional docstring
2222
that will be shown in the documentation of the associated enumeration.
2323

24+
* Intel compilers have needed to be >= 17.0 since v2.1. Now the check
25+
is explicit and a compile-time error is raised if the compiler does
26+
not meet the requirements.
27+
2428
v2.2.2 (February 7, 2018)
2529
-----------------------------------------------------
2630

docs/intro.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,4 +91,4 @@ Supported compilers
9191
1. Clang/LLVM (any non-ancient version with C++11 support)
9292
2. GCC 4.8 or newer
9393
3. Microsoft Visual Studio 2015 or newer
94-
4. Intel C++ compiler v15 or newer
94+
4. Intel C++ compiler v17 or newer (v16 with pybind11 v2.0 and v15 with pybind11 v2.0 and a `workaround <https://github.com/pybind/pybind11/issues/276>`_ )

include/pybind11/detail/common.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646

4747
// Compiler version assertions
4848
#if defined(__INTEL_COMPILER)
49-
# if __INTEL_COMPILER < 1500
50-
# error pybind11 requires Intel C++ compiler v15 or newer
49+
# if __INTEL_COMPILER < 1700
50+
# error pybind11 requires Intel C++ compiler v17 or newer
5151
# endif
5252
#elif defined(__clang__) && !defined(__apple_build_version__)
5353
# if __clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ < 3)

0 commit comments

Comments
 (0)