From bc8356bb8359e531c793a2c9fc4a0e46c34361f3 Mon Sep 17 00:00:00 2001 From: sephiroth99 Date: Tue, 25 Apr 2017 03:25:05 -0400 Subject: [PATCH] Remove usage of non standard identity struct std::identity was removed from the standards, but Visual Studio kept it as an extension. Replace it by std::remove_reference, which does just a little bit more than std::identity does, but without impact in this case. --- src/xenia/base/bit_field.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/xenia/base/bit_field.h b/src/xenia/base/bit_field.h index a089775c9..034f43d9e 100644 --- a/src/xenia/base/bit_field.h +++ b/src/xenia/base/bit_field.h @@ -29,7 +29,8 @@ struct bf { // For enum values, we strip them down to an underlying type. typedef typename std::conditional::value, std::underlying_type, - std::identity>::type::type value_type; + std::remove_reference>::type::type + value_type; inline value_type mask() const { return (((value_type)~0) >> (8 * sizeof(value_type) - n_bits)) << position; } @@ -39,4 +40,4 @@ struct bf { } // namespace xe -#endif // XENIA_BASE_BIT_FIELD_H_ \ No newline at end of file +#endif // XENIA_BASE_BIT_FIELD_H_