Merge pull request openPMD#618 from ax3l/fix-variantNVCChotfixConstexpr

MPark.Variant: Hotfix NVCC C++14
franzpoeschel · Nov 26, 2019 · 9356dbb · 9356dbb
2 parents 4b5b505 + 33fe2c9
commit 9356dbb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -24,6 +24,7 @@ Bug Fixes
 - nvcc:
 
   - ignore export of ``enum class Operation`` #617
+  - fix C++14 build #618
 
 Other
 """""

diff --git a/share/openPMD/thirdParty/variant/include/mpark/variant.hpp b/share/openPMD/thirdParty/variant/include/mpark/variant.hpp
@@ -2655,7 +2655,7 @@ namespace mpark {
     return false;
   }
 
-#ifdef MPARK_CPP14_CONSTEXPR
+#if defined(MPARK_CPP14_CONSTEXPR) && !defined(__NVCC__)
   namespace detail {
 
     inline constexpr bool all(std::initializer_list<bool> bs) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,6 +24,7 @@ Bug Fixes @@
     - nvcc:
       - ignore export of ``enum class Operation`` #617
+      - fix C++14 build #618
     Other
     """""
@@ Expand Down @@