Commit 27bbfad9 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

Fix a few MSVC specific conditions

VS2015 (partially) supports constexpr
parent a05b6942
......@@ -46,7 +46,7 @@ private:
Seek,
Close,
};
#ifndef _MSC_VER
#if !defined(_MSC_VER) || _MSC_VER >= 1900
static constexpr unsigned int NbEvents = 4;
#else
static const unsigned int NbEvents = 4;
......
......@@ -231,7 +231,7 @@ namespace VLC
template <typename OpenCb, BoxingStrategy Strategy_>
struct GuessBoxingStrategy
{
#ifndef _MSC_VER
#if !defined(_MSC_VER) || _MSC_VER >= 1900
static constexpr BoxingStrategy Strategy = Strategy_;
#else
static const BoxingStrategy Strategy = Strategy_;
......@@ -243,7 +243,7 @@ namespace VLC
template <BoxingStrategy Strategy_>
struct GuessBoxingStrategy<std::nullptr_t, Strategy_>
{
#ifndef _MSC_VER
#if !defined(_MSC_VER) || _MSC_VER >= 1900
static constexpr BoxingStrategy Strategy = BoxingStrategy::None;
#else
static const BoxingStrategy Strategy = BoxingStrategy::None;
......
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