Ogre's include guards currently are of the form _File_H_, which means we are using identifiers that are reserved. See: http://stackoverflow.com/questions/228783/what-are-the-rules-about-using-an-underscore-in-a-c-identifier
Also, it would probably be better to prepend "OGRE_" to the include guards as well to reduce the risk of clashes with other libraries.
I'd say let's hold off on this until 2.0. Simply because we're going to have some pretty intense merges leading up to it so let's not do anything to make it any more difficult.
Sounds good to me.
I like the_INCLUDED one, should work well with COMPONENT too.
In my own code I tend to use something like
The double underscore at the end is allowed by the standard and is good to avoid conflicts, but INCLUDED seems more useful in potential macro magic.
I've using _NameSpaceNameOfFile_H_ for the new files I've been creating.
OgreMyFile.h --> _OgreMyFile_H_
PbsMaterialsGameState.h -> _Demo_PbsMaterialsGameState_H_ (see https://bitbucket.org/sinbad/ogre/src/e79178d0a233ac4d0e9906963f01fda674e4dac1/Samples/2.0/Showcase/PbsMaterials/PbsMaterialsGameState.h?at=v2-1)
It was in line with how it was working before, except without the double underscore start.
I want to raise against header guards starting just with OGRE since it will clutter autocomplete (i.e. _OGRE is fine).