Fix clang compilation problem

[Bug/Feature]   Does not compile with clang
[Cause]         N/A
[Solution]      N/A
[Verification]  Compile using gcc and clang

Change-Id: I2c065d87b66473c1a80b402fb925ee62180c15df

diff --git a/src/config/from-json-visitor.hpp b/src/config/from-json-visitor.hpp
index 9ebe1fc..41b09cd 100644 (file)
--- a/src/config/from-json-visitor.hpp
+++ b/src/config/from-json-visitor.hpp
@@ -57,7 +57,7 @@ public:
 
     FromJsonVisitor& operator=(const FromJsonVisitor&) = delete;
 
-    template<class T>
+    template<typename T>
     void visit(const std::string& name, T& value)
     {
         json_object* object = nullptr;
@@ -117,7 +117,7 @@ private:
         value = json_object_get_string(object);
     }
 
-    template<class T>
+    template<typename T>
     static void fromJsonObject(json_object* object, std::vector<T>& value)
     {
         checkType(object, json_type_array);
@@ -128,7 +128,7 @@ private:
         }
     }
 
-    template<class T, class = typename std::enable_if<isVisitable<T>::value>::type>
+    template<typename T, class = typename std::enable_if<isVisitable<T>::value>::type>
     static void fromJsonObject(json_object* object, T& value)
     {
         checkType(object, json_type_object);

diff --git a/src/config/from-kvstore-visitor.hpp b/src/config/from-kvstore-visitor.hpp
index 5b63410..25c4182 100644 (file)
--- a/src/config/from-kvstore-visitor.hpp
+++ b/src/config/from-kvstore-visitor.hpp
@@ -54,7 +54,7 @@ public:
 
     FromKVStoreVisitor& operator=(const FromKVStoreVisitor&) = delete;
 
-    template<class T>
+    template<typename T>
     void visit(const std::string& name, T& value)
     {
         getInternal(key(mKeyPrefix, name), value);
@@ -64,13 +64,13 @@ private:
     std::shared_ptr<KVStore> mStorePtr;
     std::string mKeyPrefix;
 
-    template<class T, class std::enable_if<!isVisitable<T>::value, int>::type = 0>
+    template<typename T, typename std::enable_if<!isVisitable<T>::value, int>::type = 0>
     void getInternal(const std::string& name, T& value)
     {
         value = mStorePtr->get<T>(name);
     }
 
-    template<class T, class std::enable_if<isVisitable<T>::value, int>::type = 0>
+    template<typename T, typename std::enable_if<isVisitable<T>::value, int>::type = 0>
     void getInternal(const std::string& name, T& value)
     {
         FromKVStoreVisitor visitor(*this, name);

diff --git a/src/config/to-json-visitor.hpp b/src/config/to-json-visitor.hpp
index ade4ef3..85f8a16 100644 (file)
--- a/src/config/to-json-visitor.hpp
+++ b/src/config/to-json-visitor.hpp
@@ -58,7 +58,7 @@ public:
         return json_object_to_json_string(mObject);
     }
 
-    template<class T>
+    template<typename T>
     void visit(const std::string& name, const T& value)
     {
         json_object_object_add(mObject, name.c_str(), toJsonObject(value));
@@ -99,7 +99,7 @@ private:
         return json_object_new_string(value.c_str());
     }
 
-    template<class T>
+    template<typename T>
     static json_object* toJsonObject(const std::vector<T>& value)
     {
         json_object* array = json_object_new_array();
@@ -109,7 +109,7 @@ private:
         return array;
     }
 
-    template<class T, class = typename std::enable_if<isVisitable<T>::value>::type>
+    template<typename T, class = typename std::enable_if<isVisitable<T>::value>::type>
     static json_object* toJsonObject(const T& value)
     {
         ToJsonVisitor visitor;

diff --git a/src/config/to-kvstore-visitor.hpp b/src/config/to-kvstore-visitor.hpp
index 8e6f577..dcb7d8c 100644 (file)
--- a/src/config/to-kvstore-visitor.hpp
+++ b/src/config/to-kvstore-visitor.hpp
@@ -54,7 +54,7 @@ public:
 
     ToKVStoreVisitor& operator=(const ToKVStoreVisitor&) = delete;
 
-    template<class T>
+    template<typename T>
     void visit(const std::string& name, const T& value)
     {
         setInternal(key(mKeyPrefix, name), value);
@@ -65,13 +65,13 @@ private:
     std::string mKeyPrefix;
 
 
-    template<class T, class std::enable_if<!isVisitable<T>::value, int>::type = 0>
+    template<typename T, typename std::enable_if<!isVisitable<T>::value, int>::type = 0>
     void setInternal(const std::string& name, const T& value)
     {
         mStorePtr->set(name, value);
     }
 
-    template<class T, class std::enable_if<isVisitable<T>::value, int>::type = 0>
+    template<typename T, typename std::enable_if<isVisitable<T>::value, int>::type = 0>
     void setInternal(const std::string& name, const T& value)
     {
         ToKVStoreVisitor visitor(*this, name);