1 files changed, 30 insertions, 28 deletions
diff --git a/src/core/device.h b/src/core/device.h
index f586652..4d0a8e0 100644
--- a/src/core/device.h
+++ b/src/core/device.h
@@ -1,5 +1,5 @@
-#ifndef DEVICE_H
-#define DEVICE_H
+#ifndef COAL_DEVICEID_H
+#define COAL_DEVICEID_H
 
 #include "deviceinfo.h"
 
@@ -7,41 +7,43 @@
 
 struct pipe_screen;
 
+namespace Coal {
 
-class Device
-{
-public:
-   static Device *create(cl_uint type);
-public:
-   inline cl_uint type() const;
-   inline struct pipe_screen *screen() const;
+   class DeviceId
+   {
+   public:
+      static DeviceId *create(cl_uint type);
+   public:
+      inline cl_uint type() const;
+      inline struct pipe_screen *screen() const;
 
-   cl_int info(cl_device_info  opcode,
-               size_t          paramValueSize,
-               void *          paramValue,
-               size_t *        paramValueSizeRet) const;
+      cl_int info(cl_device_info  opcode,
+                  size_t          paramValueSize,
+                  void *          paramValue,
+                  size_t *        paramValueSizeRet) const;
 
-private:
-   Device(cl_uint type, struct pipe_screen *screen);
-   void fillInfo(cl_uint type);
+   private:
+      DeviceId(cl_uint type, struct pipe_screen *screen);
+      void fillInfo(cl_uint type);
 
-private:
-   DeviceInfo m_info;
+   private:
+      DeviceInfo m_info;
 
-   struct pipe_screen *m_screen;
-};
+      struct pipe_screen *m_screen;
+   };
 
-inline cl_uint Device::type() const
-{
-   return m_info.type;
-}
+   inline cl_uint DeviceId::type() const
+   {
+      return m_info.type;
+   }
 
-inline struct pipe_screen *Device::screen() const
-{
-   return m_screen;
+   inline struct pipe_screen *DeviceId::screen() const
+   {
+      return m_screen;
+   }
 }
 
-struct _cl_device_id : public Device
+struct _cl_device_id : public Coal::DeviceId
 {};
 
 #endif