Browse Source

Fully qualified ClassID name in macros for use in non-Atomic namespaced objects.

(cherry picked from commit 5c53292aac793700ebcd95caaf9265b29d5017cd)

(cherry picked from commit 5c53292aac793700ebcd95caaf9265b29d5017cd)
Matt Benic 10 years ago
parent
commit
93a0c879af
2 changed files with 4 additions and 4 deletions
  1. 2 2
      Source/Atomic/Container/RefCounted.h
  2. 2 2
      Source/Atomic/Core/Object.h

+ 2 - 2
Source/Atomic/Container/RefCounted.h

@@ -32,8 +32,8 @@ typedef const void* ClassID;
 /// Macro to be included in RefCounted derived classes for efficient RTTI
 #define REFCOUNTED(typeName) \
     public: \
-        virtual ClassID GetClassID() const { return GetClassIDStatic(); } \
-        static ClassID GetClassIDStatic() { static const int typeID = 0; return (ClassID) &typeID; }
+        virtual Atomic::ClassID GetClassID() const { return GetClassIDStatic(); } \
+        static Atomic::ClassID GetClassIDStatic() { static const int typeID = 0; return (Atomic::ClassID) &typeID; }
 
 // ATOMIC END
 

+ 2 - 2
Source/Atomic/Core/Object.h

@@ -40,8 +40,8 @@ class EventHandler;
         virtual const Atomic::String& GetTypeName() const { return GetTypeNameStatic(); } \
         static Atomic::StringHash GetTypeStatic() { static const Atomic::StringHash typeStatic(#typeName); return typeStatic; } \
         static const Atomic::String& GetTypeNameStatic() { static const Atomic::String typeNameStatic(#typeName); return typeNameStatic; } \
-        virtual ClassID GetClassID() const { return GetClassIDStatic(); } \
-        static ClassID GetClassIDStatic() { static const int typeID = 0; return (ClassID) &typeID; }
+        virtual Atomic::ClassID GetClassID() const { return GetClassIDStatic(); } \
+        static Atomic::ClassID GetClassIDStatic() { static const int typeID = 0; return (Atomic::ClassID) &typeID; }
 
 #define BASEOBJECT(typeName) \
     public: \