Simplify ClFlags macro for older C++ standards.

Visual Studio 2015 does not support the use of typename outside of a template definition. Instead alias the flag's storage type. This even avoids some duplication. BUG=swiftshader:7 Change-Id: I787701f6bfe8e36169e6ac5d63fcb6a1a114bdb0

Simplify ClFlags macro for older C++ standards.
a0b720de · Nicolas Capens · e6983131 · a0b720de
Commit a0b720de authored Sep 01, 2016 by Nicolas Capens
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 14 deletions

IceClFlags.h src/IceClFlags.h +9 -14

No files found.
--- a/src/IceClFlags.h
+++ b/src/IceClFlags.h
@@ -111,29 +111,24 @@ public:

 #define X(Name, Type, ClType, ...)                                             \
 private:                                                                       \
-  typename detail::cl_type_traits<Type, cl_detail::ClType>::storage_type Name; \
+  using Name##StorageType =                                                    \
+      detail::cl_type_traits<Type, cl_detail::ClType>::storage_type;           \
+                                                                               \
+  Name##StorageType Name;                                                      \
                                                                               \
  template <bool E>                                                            \
  typename std::enable_if<E, void>::type set##Name##Impl(                      \
-      typename detail::cl_type_traits<Type, cl_detail::ClType>::storage_type   \
-          Value) {                                                             \
+      Name##StorageType Value) {                                               \
    Name = std::move(Value);                                                   \
  }                                                                            \
                                                                               \
  template <bool E>                                                            \
-  typename std::enable_if<!E, void>::type set##Name##Impl(                     \
-      typename detail::cl_type_traits<Type,                                    \
-                                      cl_detail::ClType>::storage_type) {}     \
-                                                                               \
-public:                                                                        \
-  typename detail::cl_type_traits<Type, cl_detail::ClType>::storage_type       \
-      get##Name() const {                                                      \
-    return Name;                                                               \
+  typename std::enable_if<!E, void>::type set##Name##Impl(Name##StorageType) { \
  }                                                                            \
                                                                               \
-  void set##Name(                                                              \
-      typename detail::cl_type_traits<Type, cl_detail::ClType>::storage_type   \
-          Value) {                                                             \
+public:                                                                        \
+  Name##StorageType get##Name() const { return Name; }                         \
+  void set##Name(Name##StorageType Value) {                                    \
    /* TODO(jpp): figure out which optional flags are used in minimal, and     \
       what are the defaults for them. */                                      \
    static constexpr bool Enable =                                             \