Fix compiler error + lint

dmlc · Nov 1, 2018 · ba924a4 · ba924a4
1 parent a4aa22e
commit ba924a4
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/common/enum_class_param.h b/src/common/enum_class_param.h
@@ -14,17 +14,18 @@
 
 // specialization of FieldEntry for enum class (backed by int)
 #define DECLARE_FIELD_ENUM_CLASS(EnumClass) \
+namespace dmlc {  \
+namespace parameter {  \
 template <>  \
-class dmlc::parameter::FieldEntry< EnumClass >  \
-  : public dmlc::parameter::FieldEntry<int> {  \
+class FieldEntry<EnumClass> : public FieldEntry<int> {  \
  public:  \
   FieldEntry<EnumClass>() {  \
     static_assert(  \
       std::is_same<int, typename std::underlying_type<EnumClass>::type>::value,  \
       "enum class must be backed by int");  \
     is_enum_ = true;  \
   }  \
-  typedef FieldEntry<int> Super;  \
+  using Super = FieldEntry<int>;  \
   void Set(void *head, const std::string &value) const override {  \
     Super::Set(head, value);  \
   }  \
@@ -37,9 +38,12 @@ class dmlc::parameter::FieldEntry< EnumClass >  \
     has_default_ = true;  \
     return *this;  \
   }  \
+  /* NOLINTNEXTLINE */  \
   inline void Init(const std::string &key, void *head, EnumClass& ref) {  \
     Super::Init(key, head, *reinterpret_cast<int*>(&ref));  \
   }  \
-};
+};  \
+}  /* namespace parameter */  \
+}  /* namespace dmlc */
 
 #endif  // XGBOOST_COMMON_ENUM_CLASS_PARAM_H_