diff options
author | 2016-11-16 20:59:35 +0100 | |
---|---|---|
committer | 2016-11-16 21:00:29 +0100 | |
commit | d5bf30edb87a11878c0f8ce3ee4fd837ecb3970f (patch) | |
tree | e75dcbcdd4aeade57fa4612ce81666e1fedb1943 | |
parent | 8e61a7d3d37d0ceaf2f6af0a460d2f9c692e5252 (diff) |
Fix compilation under VS2017 (nw)
default_semantics is used by apply so need to be public
-rw-r--r-- | src/lib/util/strformat.h | 2 | ||||
-rw-r--r-- | src/osd/eivc.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/util/strformat.h b/src/lib/util/strformat.h index abb34e80d3f..13377b21503 100644 --- a/src/lib/util/strformat.h +++ b/src/lib/util/strformat.h @@ -592,10 +592,10 @@ private: { static constexpr bool value = std::is_integral<U>::value && std::is_signed<U>::value; }; template <typename U> struct unsigned_integer_semantics { static constexpr bool value = std::is_integral<U>::value && !std::is_signed<U>::value; }; +public: template <typename U> struct default_semantics { static constexpr bool value = !signed_integer_semantics<U>::value && !unsigned_integer_semantics<U>::value; }; -public: template <typename U> static void apply(std::enable_if_t<signed_integer_semantics<U>::value, Stream> &str, format_flags const &flags, U const &value) { diff --git a/src/osd/eivc.h b/src/osd/eivc.h index 16b00bf6dbe..cad4382c0ba 100644 --- a/src/osd/eivc.h +++ b/src/osd/eivc.h @@ -10,7 +10,7 @@ #ifndef __EIVC__ #define __EIVC__ - +#include <intrin.h> #pragma intrinsic(_BitScanReverse) |