P4 to Git Change 1063466 by gandryey@gera-dev-w7 on 2014/08/06 13:29:24

ECR #304775 - Code clean-up.
	- Keep single std::map for the app properties

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuappprofile.cpp#8 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuappprofile.hpp#5 edit

rocclr/runtime/device/gpu/gpuappprofile.hpp

@@ -16,24 +16,29 @@ public:
     AppProfile();
 
     //! return the value of enableHighPerformanceState_
-    bool enableHighPerformanceState() const {return enableHighPerformanceState_; }
-    bool reportAsOCL12Device() const {return reportAsOCL12Device_; }
+    bool enableHighPerformanceState() const { return enableHighPerformanceState_; }
+    bool reportAsOCL12Device() const { return reportAsOCL12Device_; }
 
 protected:
     //! parse application profile based on application file name
     virtual bool ParseApplicationProfile();
 
 private:
-    typedef enum DataTypesEnum
+    enum DataTypes
     {
         DataType_Unknown = 0,
         DataType_Boolean,
-    } DataTypes;
-    typedef std::map<std::string, DataTypes> DatatypeMap;
-    typedef std::map<std::string, bool*> BoolMap;
+    };
 
-    DatatypeMap propertyDatatypeMap_;
-    BoolMap boolPropertyMap_;
+    struct PropertyData {
+        PropertyData(DataTypes type, void* data): type_(type), data_(data) {}
+        DataTypes   type_;  //!< Data type
+        void*       data_;  //!< Pointer to the data
+    };
+
+    typedef std::map<std::string, PropertyData> DataMap;
+
+    DataMap propertyDataMap_;
 
     bool enableHighPerformanceState_;
     bool reportAsOCL12Device_;