Merging r6250 through r6254 from trunk to ogl-es branch

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6255 dfc29bdd-3216-0410-991c-e03cc46cb475

source/Irrlicht/irrXML.cpp

@@ -48,7 +48,7 @@ public:
 	}
 
 	//! Reads an amount of bytes from the file.
-	virtual int read(void* buffer, int sizeToRead) _IRR_OVERRIDE_
+	virtual int read(void* buffer, int sizeToRead) IRR_OVERRIDE
 	{
 		if (!File)
 			return 0;
@@ -57,7 +57,7 @@ public:
 	}
 
 	//! Returns size of file in bytes
-	virtual long getSize() const _IRR_OVERRIDE_
+	virtual long getSize() const IRR_OVERRIDE
 	{
 		return Size;
 	}