Changeset 1787 for code/trunk/src/core

Timestamp:

Sep 15, 2008, 11:19:54 AM (16 years ago)

Author:

rgrieder

Message:

Replaced macro "Class" with "GetClassIdentifier" to avoid future collision because the macro is very short.
"ID" was already replaced with the introduction of CEGUI which used ID somewhere as non-macro. The compiler error was completely misleading though…

Location:

code/trunk/src/core

Files:

• CoreIncludes.h (modified) (1 diff)
• XMLPort.cc (modified) (1 diff)
• XMLPort.h (modified) (3 diffs)

code/trunk/src/core/CoreIncludes.h

@@ -97 +97 @@
     @param ClassName The name of the class
 */
-#define Class(ClassName) \
+#define GetClassIdentifier(ClassName) \
     ClassIdentifier<ClassName>::getIdentifier()
 

code/trunk/src/core/XMLPort.cc

@@ -40 +40 @@
     bool XMLPortObjectContainer::identifierIsIncludedInLoaderMask(const Identifier* identifier)
     {
-        return ((!this->bApplyLoaderMask_) || identifier->isA(Class(Namespace)) || Loader::currentMask_s.isIncluded(identifier));
+        return ((!this->bApplyLoaderMask_) || identifier->isA(GetClassIdentifier(Namespace)) || Loader::currentMask_s.isIncluded(identifier));
     }
 }

code/trunk/src/core/XMLPort.h

@@ -301 +301 @@
                                 if (identifier)
                                 {
-                                    if (identifier->isA(Class(O)))
+                                    if (identifier->isA(GetClassIdentifier(O)))
                                     {
                                         if (this->identifierIsIncludedInLoaderMask(identifier))
@@ -333 +333 @@
                                     else
                                     {
-                                        COUT(2) << ((BaseObject*)object)->getLoaderIndentation() << "Warning: '" << child->Value() << "' is not a '" << Class(O)->getName() << "'." << std::endl;
+                                        COUT(2) << ((BaseObject*)object)->getLoaderIndentation() << "Warning: '" << child->Value() << "' is not a '" << GetClassIdentifier(O)->getName() << "'." << std::endl;
                                     }
                                 }
@@ -346 +346 @@
                     {
                         COUT(1) << std::endl;
-                        COUT(1) << "An error occurred in XMLPort.h while loading a '" << Class(O)->getName() << "' in '" << this->sectionname_ << "' of '" << this->identifier_->getName() << "' (objectname: " << ((BaseObject*)object)->getName() << ") in " << object->getLevelfile() << ":" << std::endl;
+                        COUT(1) << "An error occurred in XMLPort.h while loading a '" << GetClassIdentifier(O)->getName() << "' in '" << this->sectionname_ << "' of '" << this->identifier_->getName() << "' (objectname: " << ((BaseObject*)object)->getName() << ") in " << object->getLevelfile() << ":" << std::endl;
                         COUT(1) << ex.what() << std::endl;
                     }