Used macros to allow compilation with C++11 and constexpr #25
Conversation
It looks like something got botched here, the files contain the merge markers:
|
|
Yep, Working or resolving that now. Should be quick. |
Signed-off-by: Owen Thompson <[email protected]>
|
Merging issues were fixed. |
|
I assume that the way you found these is just to build under C++11 and fix everyplace that you got an error about constexpr not being allowed? |
| // | ||
| // Constexpr C++14 conditional definition | ||
| // | ||
| #if(__cplusplus >= 201402L) |
There was a problem hiding this comment.
Older versions of MSVS were not good about setting this, and so you will end up with C++14 compliant MSVS versions that will not constexpr these even though they can. I would recommend the following test instead:
#if (__cplusplus >= 201402L) || (defined(_MSC_VER) && _MSC_VER >= 1914)
Yeah that was the primary means of finding these. |
|
This is really great, @oxt3479, I've wanted this for years. |
Changes were alluded to in a previous pull request. Getting this through early is beneficial as changes needed for CUDA integration will have a lot of conflicts with this PR if not done on top of them.
Previously, compilation with C++11 was not possible because of limited utility of constexpr. IMATH_CONSTEXPR14 is now used primarily on methods which are not return statements. It is defined under the condition that the compiler exceeds C++14, and is specified in config/ImathConfig.h.in