Skip to content

P
pybind11
Commit 8706fb90 by Wenzel Jakob
Options

Intel compiler 2017 fix

parent 6fd3132e
Showing with 6 additions and 3 deletions
include/pybind11/descr.h
...@@ -15,8 +15,9 @@ ...@@ -15,8 +15,9 @@
NAMESPACE_BEGIN(pybind11) NAMESPACE_BEGIN(pybind11)
NAMESPACE_BEGIN(detail) NAMESPACE_BEGIN(detail)
#if defined(__INTEL_COMPILER)
#if defined(__clang__) /* C++14 features not supported for now */
#elif defined(__clang__)
# if __has_feature(cxx_return_type_deduction) && __has_feature(cxx_relaxed_constexpr) # if __has_feature(cxx_return_type_deduction) && __has_feature(cxx_relaxed_constexpr)
# define PYBIND11_CPP14 # define PYBIND11_CPP14
# endif # endif
......
include/pybind11/eigen.h
...@@ -11,7 +11,9 @@ ...@@ -11,7 +11,9 @@
#include "numpy.h" #include "numpy.h"
#if defined(__GNUG__) || defined(__clang__) #if defined(__INTEL_COMPILER)
# pragma warning(disable: 1682) // implicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem)
#elif defined(__GNUG__) || defined(__clang__)
# pragma GCC diagnostic push # pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wconversion" # pragma GCC diagnostic ignored "-Wconversion"
# pragma GCC diagnostic ignored "-Wdeprecated-declarations" # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment