Merge pull request #1096 from bpay/fix-include-guards

Fix include guards
This commit is contained in:
Luis Anton Rebollo 2015-01-24 23:02:13 +01:00
commit ea0e3fd683
6 changed files with 22 additions and 3 deletions

View file

@ -23,7 +23,7 @@
#ifndef _TURRETSHAPE_H_ #ifndef _TURRETSHAPE_H_
#define _TURRETSHAPE_H_ #define _TURRETSHAPE_H_
#ifndef _SHAPEBASE_H_ #ifndef _ITEM_H_
#include "T3D/item.h" #include "T3D/item.h"
#endif #endif

View file

@ -23,7 +23,7 @@
#ifndef _TSFORESTCELLBATCH_H_ #ifndef _TSFORESTCELLBATCH_H_
#define _TSFORESTCELLBATCH_H_ #define _TSFORESTCELLBATCH_H_
#ifndef _FORESTCELLBATCH_H_ #ifndef _IMPOSTERRENDERMGR_H_
#include "renderInstance/renderImposterMgr.h" #include "renderInstance/renderImposterMgr.h"
#endif #endif
#ifndef _FORESTCELLBATCH_H_ #ifndef _FORESTCELLBATCH_H_

View file

@ -20,6 +20,9 @@
// IN THE SOFTWARE. // IN THE SOFTWARE.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifndef _GFX_D3D_VIDEOCAPTURED3D9_H_
#define _GFX_D3D_VIDEOCAPTURED3D9_H_
#ifndef _VIDEOCAPTURE_H_ #ifndef _VIDEOCAPTURE_H_
#include "gfx/video/videoCapture.h" #include "gfx/video/videoCapture.h"
#endif #endif
@ -79,4 +82,6 @@ protected:
public: public:
VideoFrameGrabberD3D9(); VideoFrameGrabberD3D9();
~VideoFrameGrabberD3D9(); ~VideoFrameGrabberD3D9();
}; };
#endif // _GFX_D3D_VIDEOCAPTURED3D9_H_

View file

@ -20,6 +20,9 @@
// IN THE SOFTWARE. // IN THE SOFTWARE.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifndef _MPOLYHEDRON_IMPL_H_
#define _MPOLYHEDRON_IMPL_H_
#include "math/mPlaneTransformer.h" #include "math/mPlaneTransformer.h"
@ -503,3 +506,5 @@ void PolyhedronData::buildBoxData( Polyhedron& poly, const MatrixF& mat, const B
edge ++; edge ++;
} }
} }
#endif // _MPOLYHEDRON_IMPL_H_

View file

@ -20,6 +20,9 @@
// IN THE SOFTWARE. // IN THE SOFTWARE.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifndef _SCENEAMBIENTSOUNDOBJECT_IMPL_H_
#define _SCENEAMBIENTSOUNDOBJECT_IMPL_H_
#include "platform/platform.h" #include "platform/platform.h"
#include "scene/mixin/sceneAmbientSoundObject.h" #include "scene/mixin/sceneAmbientSoundObject.h"
@ -112,3 +115,5 @@ bool SceneAmbientSoundObject< Base >::_setSoundAmbience( void* object, const cha
p->setSoundAmbience( ambience ); p->setSoundAmbience( ambience );
return false; return false;
} }
#endif // _SCENEAMBIENTSOUNDOBJECT_IMPL_H_

View file

@ -19,6 +19,8 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
// IN THE SOFTWARE. // IN THE SOFTWARE.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifndef _SCENEPOLYHEDRALOBJECT_IMPL_H_
#define _SCENEPOLYHEDRALOBJECT_IMPL_H_
#include "platform/platform.h" #include "platform/platform.h"
#include "scene/mixin/scenePolyhedralObject.h" #include "scene/mixin/scenePolyhedralObject.h"
@ -393,3 +395,5 @@ bool ScenePolyhedralObject< Base, P >::_setEdge( void* object, const char* index
return false; return false;
} }
#endif // _SCENEPOLYHEDRALOBJECT_IMPL_H_