From 56ed86334b96a45184c496f8e2bd4daee05e4b8a Mon Sep 17 00:00:00 2001 From: FReeshabh Date: Mon, 17 Aug 2020 10:05:39 +0200 Subject: [PATCH] general: Update header guard names to fit convention Closes #899 --- panda/src/audiotraits/fmodAudioManager.h | 6 +++--- panda/src/audiotraits/openalAudioManager.h | 6 +++--- panda/src/audiotraits/openalAudioSound.h | 6 +++--- panda/src/bullet/bulletAllHitsRayResult.h | 6 +++--- panda/src/bullet/bulletBaseCharacterControllerNode.h | 6 +++--- panda/src/bullet/bulletBodyNode.h | 8 ++++---- panda/src/bullet/bulletBoxShape.h | 6 +++--- panda/src/bullet/bulletCapsuleShape.h | 6 +++--- panda/src/bullet/bulletCharacterControllerNode.h | 8 ++++---- panda/src/bullet/bulletClosestHitRayResult.h | 6 +++--- panda/src/bullet/bulletClosestHitSweepResult.h | 6 +++--- panda/src/bullet/bulletConeShape.h | 6 +++--- panda/src/bullet/bulletConeTwistConstraint.h | 6 +++--- panda/src/bullet/bulletConstraint.h | 6 +++--- panda/src/bullet/bulletContactCallbackData.h | 6 +++--- panda/src/bullet/bulletContactCallbacks.h | 6 +++--- panda/src/bullet/bulletContactResult.h | 6 +++--- panda/src/bullet/bulletConvexHullShape.h | 6 +++--- panda/src/bullet/bulletConvexPointCloudShape.h | 6 +++--- panda/src/bullet/bulletCylinderShape.h | 6 +++--- panda/src/bullet/bulletDebugNode.h | 6 +++--- panda/src/bullet/bulletFilterCallbackData.h | 6 +++--- panda/src/bullet/bulletGenericConstraint.h | 6 +++--- panda/src/bullet/bulletGhostNode.h | 8 ++++---- panda/src/bullet/bulletHeightfieldShape.h | 6 +++--- panda/src/bullet/bulletHelper.h | 6 +++--- panda/src/bullet/bulletHingeConstraint.h | 6 +++--- panda/src/bullet/bulletManifoldPoint.h | 6 +++--- panda/src/bullet/bulletMinkowskiSumShape.h | 6 +++--- panda/src/bullet/bulletMultiSphereShape.h | 6 +++--- panda/src/bullet/bulletPersistentManifold.h | 6 +++--- panda/src/bullet/bulletPlaneShape.h | 6 +++--- panda/src/bullet/bulletRigidBodyNode.h | 6 +++--- panda/src/bullet/bulletRotationalLimitMotor.h | 6 +++--- panda/src/bullet/bulletShape.h | 8 ++++---- panda/src/bullet/bulletSliderConstraint.h | 6 +++--- panda/src/bullet/bulletSoftBodyConfig.h | 6 +++--- panda/src/bullet/bulletSoftBodyControl.h | 6 +++--- panda/src/bullet/bulletSoftBodyMaterial.h | 10 +++++----- panda/src/bullet/bulletSoftBodyNode.h | 6 +++--- panda/src/bullet/bulletSoftBodyShape.h | 7 ++++--- panda/src/bullet/bulletSoftBodyWorldInfo.h | 6 +++--- panda/src/bullet/bulletSphereShape.h | 6 +++--- panda/src/bullet/bulletSphericalConstraint.h | 6 +++--- panda/src/bullet/bulletTickCallbackData.h | 6 +++--- panda/src/bullet/bulletTranslationalLimitMotor.h | 6 +++--- panda/src/bullet/bulletTriangleMesh.h | 6 +++--- panda/src/bullet/bulletTriangleMeshShape.h | 6 +++--- panda/src/bullet/bulletVehicle.h | 6 +++--- panda/src/bullet/bulletWheel.h | 6 +++--- panda/src/bullet/bulletWorld.h | 6 +++--- panda/src/bullet/bullet_includes.h | 6 +++--- panda/src/bullet/bullet_utils.h | 6 +++--- panda/src/bullet/config_bullet.h | 6 +++--- panda/src/nativenet/buffered_datagramreader.h | 7 +++---- panda/src/nativenet/buffered_datagramwriter.h | 6 +++--- panda/src/nativenet/membuffer.h | 6 +++--- panda/src/nativenet/ringbuffer.h | 6 +++--- panda/src/nativenet/socket_base.h | 6 +++--- panda/src/nativenet/socket_fdset.h | 6 +++--- panda/src/nativenet/socket_ip.h | 6 +++--- panda/src/nativenet/socket_portable.h | 6 +++--- panda/src/nativenet/socket_selector.h | 6 +++--- panda/src/nativenet/socket_tcp.h | 6 +++--- panda/src/nativenet/socket_tcp_listen.h | 6 +++--- panda/src/nativenet/socket_udp.h | 6 +++--- panda/src/nativenet/socket_udp_incoming.h | 6 +++--- panda/src/nativenet/time_base.h | 6 +++--- panda/src/nativenet/time_out.h | 6 +++--- panda/src/nativenet/time_span.h | 6 +++--- 70 files changed, 217 insertions(+), 217 deletions(-) diff --git a/panda/src/audiotraits/fmodAudioManager.h b/panda/src/audiotraits/fmodAudioManager.h index 6b630c1527..a9e5e94bda 100644 --- a/panda/src/audiotraits/fmodAudioManager.h +++ b/panda/src/audiotraits/fmodAudioManager.h @@ -62,8 +62,8 @@ * of the code. */ -#ifndef __FMOD_AUDIO_MANAGER_H__ -#define __FMOD_AUDIO_MANAGER_H__ +#ifndef FMODAUDIOMANAGER_H +#define FMODAUDIOMANAGER_H // First the includes. #include "pandabase.h" @@ -212,4 +212,4 @@ private: EXPCL_FMOD_AUDIO AudioManager *Create_FmodAudioManager(); -#endif /* __FMOD_AUDIO_MANAGER_H__ */ +#endif /* FMODAUDIOMANAGER_H */ diff --git a/panda/src/audiotraits/openalAudioManager.h b/panda/src/audiotraits/openalAudioManager.h index d79d4c06f7..a0e3d549bb 100644 --- a/panda/src/audiotraits/openalAudioManager.h +++ b/panda/src/audiotraits/openalAudioManager.h @@ -10,8 +10,8 @@ * @author Ben Buchwald */ -#ifndef __OPENAL_AUDIO_MANAGER_H__ -#define __OPENAL_AUDIO_MANAGER_H__ +#ifndef OPENALAUDIOMANAGER_H +#define OPENALAUDIOMANAGER_H #include "pandabase.h" @@ -242,4 +242,4 @@ private: EXPCL_OPENAL_AUDIO AudioManager *Create_OpenALAudioManager(); -#endif /* __OPENAL_AUDIO_MANAGER_H__ */ +#endif /* OPENALAUDIOMANAGER_H */ diff --git a/panda/src/audiotraits/openalAudioSound.h b/panda/src/audiotraits/openalAudioSound.h index 3c1feda08a..46fbaadca6 100644 --- a/panda/src/audiotraits/openalAudioSound.h +++ b/panda/src/audiotraits/openalAudioSound.h @@ -10,8 +10,8 @@ * @author Ben Buchwald */ -#ifndef __OPENAL_AUDIO_SOUND_H__ -#define __OPENAL_AUDIO_SOUND_H__ +#ifndef OPENALAUDIOSOUND_H +#define OPENALAUDIOSOUND_H #include "pandabase.h" @@ -209,4 +209,4 @@ private: #include "openalAudioSound.I" -#endif /* __OPENAL_AUDIO_SOUND_H__ */ +#endif /* __OPENALAUDIOSOUND_H__ */ diff --git a/panda/src/bullet/bulletAllHitsRayResult.h b/panda/src/bullet/bulletAllHitsRayResult.h index b0b31e04d3..0153e424a8 100644 --- a/panda/src/bullet/bulletAllHitsRayResult.h +++ b/panda/src/bullet/bulletAllHitsRayResult.h @@ -11,8 +11,8 @@ * @date 2010-02-21 */ -#ifndef __BULLET_ALL_HITS_RAY_RESULT_H__ -#define __BULLET_ALL_HITS_RAY_RESULT_H__ +#ifndef BULLETALLHITSRAYRESULT_H +#define BULLETALLHITSRAYRESULT_H #include "pandabase.h" @@ -98,4 +98,4 @@ private: #include "bulletAllHitsRayResult.I" -#endif // __BULLET_ALL_HITS_RAY_RESULT_H__ +#endif // BULLETALLHITSRAYRESULT_H diff --git a/panda/src/bullet/bulletBaseCharacterControllerNode.h b/panda/src/bullet/bulletBaseCharacterControllerNode.h index eafc561c67..b8ebc77592 100644 --- a/panda/src/bullet/bulletBaseCharacterControllerNode.h +++ b/panda/src/bullet/bulletBaseCharacterControllerNode.h @@ -11,8 +11,8 @@ * @date 2010-11-21 */ -#ifndef __BULLET_BASE_CHARACTER_CONTROLLER_NODE_H__ -#define __BULLET_BASE_CHARACTER_CONTROLLER_NODE_H__ +#ifndef BULLETBASECHARACTERCONTROLLERNODE_H +#define BULLETBASECHARACTERCONTROLLERNODE_H #include "pandabase.h" @@ -69,4 +69,4 @@ private: #include "bulletBaseCharacterControllerNode.I" -#endif // __BULLET_BASE_CHARACTER_CONTROLLER_NODE_H__ +#endif // BULLETBASECHARACTERCONTROLLERNODE_H diff --git a/panda/src/bullet/bulletBodyNode.h b/panda/src/bullet/bulletBodyNode.h index 09f2ffe7c1..d3f9439db9 100644 --- a/panda/src/bullet/bulletBodyNode.h +++ b/panda/src/bullet/bulletBodyNode.h @@ -11,8 +11,8 @@ * @date 2010-11-19 */ -#ifndef __BULLET_BODY_NODE_H__ -#define __BULLET_BODY_NODE_H__ +#ifndef BULLETBODYNODE_H +#define BULLETBODYNODE_H #include "pandabase.h" @@ -56,7 +56,7 @@ PUBLISHED: // Static and kinematic bool is_static() const; bool is_kinematic() const; - + INLINE void set_static(bool value); INLINE void set_kinematic(bool value); @@ -201,4 +201,4 @@ private: #include "bulletBodyNode.I" -#endif // __BULLET_BODY_NODE_H__ +#endif // BULLETBODYNODE_H diff --git a/panda/src/bullet/bulletBoxShape.h b/panda/src/bullet/bulletBoxShape.h index 5ac117ac76..cea8ffb304 100644 --- a/panda/src/bullet/bulletBoxShape.h +++ b/panda/src/bullet/bulletBoxShape.h @@ -11,8 +11,8 @@ * @date 2010-01-24 */ -#ifndef __BULLET_BOX_SHAPE_H__ -#define __BULLET_BOX_SHAPE_H__ +#ifndef BULLETBOXSHAPE_H +#define BULLETBOXSHAPE_H #include "pandabase.h" @@ -82,4 +82,4 @@ private: #include "bulletBoxShape.I" -#endif // __BULLET_BOX_SHAPE_H__ +#endif // BULLETBOXSHAPE_H diff --git a/panda/src/bullet/bulletCapsuleShape.h b/panda/src/bullet/bulletCapsuleShape.h index e78b06bc08..97d6bd8740 100644 --- a/panda/src/bullet/bulletCapsuleShape.h +++ b/panda/src/bullet/bulletCapsuleShape.h @@ -11,8 +11,8 @@ * @date 2010-01-27 */ -#ifndef __BULLET_CAPSULE_SHAPE_H__ -#define __BULLET_CAPSULE_SHAPE_H__ +#ifndef BULLETCAPSULESHAPE_H +#define BULLETCAPSULESHAPE_H #include "pandabase.h" @@ -86,4 +86,4 @@ private: #include "bulletCapsuleShape.I" -#endif // __BULLET_CAPSULE_SHAPE_H__ +#endif // BULLETCAPSULESHAPE_H diff --git a/panda/src/bullet/bulletCharacterControllerNode.h b/panda/src/bullet/bulletCharacterControllerNode.h index b2c43d8bb4..bb7457dfe0 100644 --- a/panda/src/bullet/bulletCharacterControllerNode.h +++ b/panda/src/bullet/bulletCharacterControllerNode.h @@ -11,8 +11,8 @@ * @date 2010-11-21 */ -#ifndef __BULLET_CHARACTER_CONTROLLER_NODE_H__ -#define __BULLET_CHARACTER_CONTROLLER_NODE_H__ +#ifndef BULLETCHARACTERCONTROLLERNODE_H +#define BULLETCHARACTERCONTROLLERNODE_H #include "pandabase.h" @@ -45,7 +45,7 @@ PUBLISHED: void set_fall_speed(PN_stdfloat fall_speed); void set_jump_speed(PN_stdfloat jump_speed); void set_max_jump_height(PN_stdfloat max_jump_height); - + void set_max_slope(PN_stdfloat max_slope); PN_stdfloat get_max_slope() const; @@ -110,4 +110,4 @@ private: #include "bulletCharacterControllerNode.I" -#endif // __BULLET_CHARACTER_CONTROLLER_NODE_H__ +#endif // BULLETCHARACTERCONTROLLERNODE_H diff --git a/panda/src/bullet/bulletClosestHitRayResult.h b/panda/src/bullet/bulletClosestHitRayResult.h index c6c31f19d0..fd351d3aac 100644 --- a/panda/src/bullet/bulletClosestHitRayResult.h +++ b/panda/src/bullet/bulletClosestHitRayResult.h @@ -11,8 +11,8 @@ * @date 2010-02-21 */ -#ifndef __BULLET_CLOSEST_HIT_RAY_RESULT_H__ -#define __BULLET_CLOSEST_HIT_RAY_RESULT_H__ +#ifndef BULLETCLOSESTHITRAYRESULT_H +#define BULLETCLOSESTHITRAYRESULT_H #include "pandabase.h" @@ -70,4 +70,4 @@ private: #include "bulletClosestHitRayResult.I" -#endif // __BULLET_CLOSEST_HIT_RAY_RESULT_H__ +#endif // BULLETCLOSESTHITRAYRESULT_H diff --git a/panda/src/bullet/bulletClosestHitSweepResult.h b/panda/src/bullet/bulletClosestHitSweepResult.h index aba5ff57d8..2581cd34ff 100644 --- a/panda/src/bullet/bulletClosestHitSweepResult.h +++ b/panda/src/bullet/bulletClosestHitSweepResult.h @@ -11,8 +11,8 @@ * @date 2010-12-01 */ -#ifndef __BULLET_CLOSEST_HIT_SWEEP_RESULT_H__ -#define __BULLET_CLOSEST_HIT_SWEEP_RESULT_H__ +#ifndef BULLETCLOSESTHITSWEEPRESULT_H +#define BULLETCLOSESTHITSWEEPRESULT_H #include "pandabase.h" @@ -61,4 +61,4 @@ private: #include "bulletClosestHitSweepResult.I" -#endif // __BULLET_CLOSEST_HIT_SWEEP_RESULT_H__ +#endif // BULLETCLOSESTHITSWEEPRESULT_H diff --git a/panda/src/bullet/bulletConeShape.h b/panda/src/bullet/bulletConeShape.h index 89d085f834..0cedb63c67 100644 --- a/panda/src/bullet/bulletConeShape.h +++ b/panda/src/bullet/bulletConeShape.h @@ -11,8 +11,8 @@ * @date 2010-01-24 */ -#ifndef __BULLET_CONE_SHAPE_H__ -#define __BULLET_CONE_SHAPE_H__ +#ifndef BULLETCONESHAPE_H +#define BULLETCONESHAPE_H #include "pandabase.h" @@ -79,4 +79,4 @@ private: #include "bulletConeShape.I" -#endif // __BULLET_CONE_SHAPE_H__ +#endif // BULLETCONESHAPE_H diff --git a/panda/src/bullet/bulletConeTwistConstraint.h b/panda/src/bullet/bulletConeTwistConstraint.h index d7fabee508..02ee094bab 100644 --- a/panda/src/bullet/bulletConeTwistConstraint.h +++ b/panda/src/bullet/bulletConeTwistConstraint.h @@ -11,8 +11,8 @@ * @date 2010-03-01 */ -#ifndef __BULLET_CONE_TWIST_CONSTRAINT_H__ -#define __BULLET_CONE_TWIST_CONSTRAINT_H__ +#ifndef BULLETCONETWISTCONSTRAINT_H +#define BULLETCONETWISTCONSTRAINT_H #include "pandabase.h" @@ -89,4 +89,4 @@ private: #include "bulletConeTwistConstraint.I" -#endif // __BULLET_CONE_TWIST_CONSTRAINT_H__ +#endif // BULLETCONETWISTCONSTRAINT_H diff --git a/panda/src/bullet/bulletConstraint.h b/panda/src/bullet/bulletConstraint.h index 85b0f0d63d..7cd86af04b 100644 --- a/panda/src/bullet/bulletConstraint.h +++ b/panda/src/bullet/bulletConstraint.h @@ -11,8 +11,8 @@ * @date 2010-03-01 */ -#ifndef __BULLET_CONSTRAINT_H__ -#define __BULLET_CONSTRAINT_H__ +#ifndef BULLETCONSTRAINT_H +#define BULLETCONSTRAINT_H #include "pandabase.h" @@ -87,4 +87,4 @@ private: #include "bulletConstraint.I" -#endif // __BULLET_CONSTRAINT_H__ +#endif // BULLETCONSTRAINT_H diff --git a/panda/src/bullet/bulletContactCallbackData.h b/panda/src/bullet/bulletContactCallbackData.h index c6c45c1e07..9ed17b8e1c 100644 --- a/panda/src/bullet/bulletContactCallbackData.h +++ b/panda/src/bullet/bulletContactCallbackData.h @@ -11,8 +11,8 @@ * @date 2012-11-22 */ -#ifndef __BULLET_CONTACT_CALLBACK_DATA_H__ -#define __BULLET_CONTACT_CALLBACK_DATA_H__ +#ifndef BULLETCONTACTCALLBACKDATA_H +#define BULLETCONTACTCALLBACKDATA_H #include "pandabase.h" #include "callbackData.h" @@ -81,4 +81,4 @@ private: #include "bulletContactCallbackData.I" -#endif // __BULLET_CONTACT_CALLBACK_DATA_H__ +#endif // BULLETCONTACTCALLBACKDATA_H diff --git a/panda/src/bullet/bulletContactCallbacks.h b/panda/src/bullet/bulletContactCallbacks.h index b2027ddff6..a0e7e6c79f 100644 --- a/panda/src/bullet/bulletContactCallbacks.h +++ b/panda/src/bullet/bulletContactCallbacks.h @@ -11,8 +11,8 @@ * @date 2010-04-10 */ -#ifndef __BULLET_CONTACT_CALLBACKS_H__ -#define __BULLET_CONTACT_CALLBACKS_H__ +#ifndef BULLETCONTACTCALLBACKS_H +#define BULLETCONTACTCALLBACKS_H #include "pandabase.h" @@ -147,4 +147,4 @@ contact_destroyed_callback(void *userPersistentData) { return false; } -#endif // __BULLET_CONTACT_CALLBACKS_H__ +#endif // BULLETCONTACTCALLBACKS_H diff --git a/panda/src/bullet/bulletContactResult.h b/panda/src/bullet/bulletContactResult.h index afcf1ea51a..5a881455b0 100644 --- a/panda/src/bullet/bulletContactResult.h +++ b/panda/src/bullet/bulletContactResult.h @@ -11,8 +11,8 @@ * @date 2010-03-08 */ -#ifndef __BULLET_CONTACT_RESULT_H__ -#define __BULLET_CONTACT_RESULT_H__ +#ifndef BULLETCONTACTRESULT_H +#define BULLETCONTACTRESULT_H #include "pandabase.h" @@ -110,4 +110,4 @@ private: #include "bulletContactResult.I" -#endif // __BULLET_CONTACT_RESULT_H__ +#endif // BULLETCONTACTRESULT_H diff --git a/panda/src/bullet/bulletConvexHullShape.h b/panda/src/bullet/bulletConvexHullShape.h index 27e006f1d0..7b36dcc3b6 100644 --- a/panda/src/bullet/bulletConvexHullShape.h +++ b/panda/src/bullet/bulletConvexHullShape.h @@ -11,8 +11,8 @@ * @date 2010-01-26 */ -#ifndef __BULLET_CONVEX_HULL_SHAPE_H__ -#define __BULLET_CONVEX_HULL_SHAPE_H__ +#ifndef BULLETCONVEXHULLSHAPE_H +#define BULLETCONVEXHULLSHAPE_H #include "pandabase.h" @@ -75,4 +75,4 @@ private: #include "bulletConvexHullShape.I" -#endif // __BULLET_CONVEX_HULL_SHAPE_H__ +#endif // BULLETCONVEXHULLSHAPE_H diff --git a/panda/src/bullet/bulletConvexPointCloudShape.h b/panda/src/bullet/bulletConvexPointCloudShape.h index 0bf1d7e427..5daae6b0a1 100644 --- a/panda/src/bullet/bulletConvexPointCloudShape.h +++ b/panda/src/bullet/bulletConvexPointCloudShape.h @@ -11,8 +11,8 @@ * @date 2010-01-30 */ -#ifndef __BULLET_CONVEX_POINT_CLOUD_SHAPE_H__ -#define __BULLET_CONVEX_POINT_CLOUD_SHAPE_H__ +#ifndef BULLETCONVEXPOINTCLOUDSHAPE_H +#define BULLETCONVEXPOINTCLOUDSHAPE_H #include "pandabase.h" @@ -78,4 +78,4 @@ private: #include "bulletConvexPointCloudShape.I" -#endif // __BULLET_CONVEX_POINT_CLOUD_SHAPE_H__ +#endif // BULLETCONVEXPOINTCLOUDSHAPE_H diff --git a/panda/src/bullet/bulletCylinderShape.h b/panda/src/bullet/bulletCylinderShape.h index 901e48b4ff..f92ba15749 100644 --- a/panda/src/bullet/bulletCylinderShape.h +++ b/panda/src/bullet/bulletCylinderShape.h @@ -11,8 +11,8 @@ * @date 2010-02-17 */ -#ifndef __BULLET_CYLINDER_SHAPE_H__ -#define __BULLET_CYLINDER_SHAPE_H__ +#ifndef BULLETCYLINDERSHAPE_H +#define BULLETCYLINDERSHAPE_H #include "pandabase.h" @@ -81,4 +81,4 @@ private: #include "bulletCylinderShape.I" -#endif // __BULLET_CYLINDER_SHAPE_H__ +#endif // BULLETCYLINDERSHAPE_H diff --git a/panda/src/bullet/bulletDebugNode.h b/panda/src/bullet/bulletDebugNode.h index 2426cdac63..720e26fbd3 100644 --- a/panda/src/bullet/bulletDebugNode.h +++ b/panda/src/bullet/bulletDebugNode.h @@ -11,8 +11,8 @@ * @date 2010-01-23 */ -#ifndef __BULLET_DEBUG_NODE_H__ -#define __BULLET_DEBUG_NODE_H__ +#ifndef BULLETDEBUGNODE_H +#define BULLETDEBUGNODE_H #include "pandabase.h" @@ -151,4 +151,4 @@ private: #include "bulletDebugNode.I" -#endif // __BULLET_DEBUG_NODE_H__ +#endif // BULLETDEBUGNODE_H diff --git a/panda/src/bullet/bulletFilterCallbackData.h b/panda/src/bullet/bulletFilterCallbackData.h index 36e3117716..7e5929050b 100644 --- a/panda/src/bullet/bulletFilterCallbackData.h +++ b/panda/src/bullet/bulletFilterCallbackData.h @@ -11,8 +11,8 @@ * @date 2012-11-26 */ -#ifndef __BULLET_FILTER_CALLBACK_DATA_H__ -#define __BULLET_FILTER_CALLBACK_DATA_H__ +#ifndef BULLETFILTERCALLBACKDATA_H +#define BULLETFILTERCALLBACKDATA_H #include "pandabase.h" #include "callbackData.h" @@ -68,4 +68,4 @@ private: #include "bulletFilterCallbackData.I" -#endif // __BULLET_FILTER_CALLBACK_DATA_H__ +#endif // BULLETFILTERCALLBACKDATA_H diff --git a/panda/src/bullet/bulletGenericConstraint.h b/panda/src/bullet/bulletGenericConstraint.h index f571df1ad6..2b922d6e47 100644 --- a/panda/src/bullet/bulletGenericConstraint.h +++ b/panda/src/bullet/bulletGenericConstraint.h @@ -11,8 +11,8 @@ * @date 2010-03-02 */ -#ifndef __BULLET_GENERIC_CONSTRAINT_H__ -#define __BULLET_GENERIC_CONSTRAINT_H__ +#ifndef BULLETGENERICCONSTRAINT_H +#define BULLETGENERICCONSTRAINT_H #include "pandabase.h" @@ -95,4 +95,4 @@ private: #include "bulletGenericConstraint.I" -#endif // __BULLET_GENERIC_CONSTRAINT_H__ +#endif // BULLETGENERICCONSTRAINT_H diff --git a/panda/src/bullet/bulletGhostNode.h b/panda/src/bullet/bulletGhostNode.h index a76c0ce8a1..74eed65a56 100644 --- a/panda/src/bullet/bulletGhostNode.h +++ b/panda/src/bullet/bulletGhostNode.h @@ -11,8 +11,8 @@ * @date 2010-11-19 */ -#ifndef __BULLET_GHOST_NODE_H__ -#define __BULLET_GHOST_NODE_H__ +#ifndef BULLETGHOSTNODE_H +#define BULLETGHOSTNODE_H #include "pandabase.h" @@ -37,7 +37,7 @@ PUBLISHED: int get_num_overlapping_nodes() const; PandaNode *get_overlapping_node(int idx) const; MAKE_SEQ(get_overlapping_nodes, get_num_overlapping_nodes, get_overlapping_node); - + MAKE_SEQ_PROPERTY(overlapping_nodes, get_num_overlapping_nodes, get_overlapping_node); public: @@ -82,4 +82,4 @@ private: #include "bulletGhostNode.I" -#endif // __BULLET_GHOST_NODE_H__ +#endif // BULLETGHOSTNODE_H diff --git a/panda/src/bullet/bulletHeightfieldShape.h b/panda/src/bullet/bulletHeightfieldShape.h index 3631ca1a9d..6d5c3da8bc 100644 --- a/panda/src/bullet/bulletHeightfieldShape.h +++ b/panda/src/bullet/bulletHeightfieldShape.h @@ -11,8 +11,8 @@ * @date 2010-02-05 */ -#ifndef __BULLET_HEIGHTFIELD_SHAPE_H__ -#define __BULLET_HEIGHTFIELD_SHAPE_H__ +#ifndef BULLETHEIGHTFIELDSHAPE_H +#define BULLETHEIGHTFIELDSHAPE_H #include "pandabase.h" @@ -81,4 +81,4 @@ private: #include "bulletHeightfieldShape.I" -#endif // __BULLET_HEIGHTFIELD_SHAPE_H__ +#endif // BULLETHEIGHTFIELDSHAPE_H diff --git a/panda/src/bullet/bulletHelper.h b/panda/src/bullet/bulletHelper.h index 4633c40928..341f437290 100644 --- a/panda/src/bullet/bulletHelper.h +++ b/panda/src/bullet/bulletHelper.h @@ -11,8 +11,8 @@ * @date 2011-01-19 */ -#ifndef __BULLET_HELPER_H__ -#define __BULLET_HELPER_H__ +#ifndef BULLETHELPER_H +#define BULLETHELPER_H #include "pandabase.h" @@ -70,4 +70,4 @@ private: #include "bulletHelper.I" -#endif // __BULLET_HELPER_H__ +#endif // BULLETHELPER_H diff --git a/panda/src/bullet/bulletHingeConstraint.h b/panda/src/bullet/bulletHingeConstraint.h index dc6768490b..ee7c1d1321 100644 --- a/panda/src/bullet/bulletHingeConstraint.h +++ b/panda/src/bullet/bulletHingeConstraint.h @@ -11,8 +11,8 @@ * @date 2010-03-01 */ -#ifndef __BULLET_HINGE_CONSTRAINT_H__ -#define __BULLET_HINGE_CONSTRAINT_H__ +#ifndef BULLETHINGECONSTRAINT_H +#define BULLETHINGECONSTRAINT_H #include "pandabase.h" @@ -108,4 +108,4 @@ private: #include "bulletHingeConstraint.I" -#endif // __BULLET_HINGE_CONSTRAINT_H__ +#endif // BULLETHINGECONSTRAINT_H diff --git a/panda/src/bullet/bulletManifoldPoint.h b/panda/src/bullet/bulletManifoldPoint.h index bc4c0f9486..633c187d88 100644 --- a/panda/src/bullet/bulletManifoldPoint.h +++ b/panda/src/bullet/bulletManifoldPoint.h @@ -11,8 +11,8 @@ * @date 2010-03-07 */ -#ifndef __BULLET_MANIFOLD_POINT_H__ -#define __BULLET_MANIFOLD_POINT_H__ +#ifndef BULLETMANIFOLDPOINT_H +#define BULLETMANIFOLDPOINT_H #include "pandabase.h" @@ -104,4 +104,4 @@ private: #include "bulletManifoldPoint.I" -#endif // __BULLET_MANIFOLD_POINT_H__ +#endif // BULLETMANIFOLDPOINT_H diff --git a/panda/src/bullet/bulletMinkowskiSumShape.h b/panda/src/bullet/bulletMinkowskiSumShape.h index f8f531ed99..ac35d91415 100644 --- a/panda/src/bullet/bulletMinkowskiSumShape.h +++ b/panda/src/bullet/bulletMinkowskiSumShape.h @@ -11,8 +11,8 @@ * @date 2013-08-15 */ -#ifndef __BULLET_MINKOWSKI_SUM_SHAPE_H__ -#define __BULLET_MINKOWSKI_SUM_SHAPE_H__ +#ifndef BULLETMINKOWSKISUMSHAPE_H +#define BULLETMINKOWSKISUMSHAPE_H #include "pandabase.h" @@ -94,4 +94,4 @@ private: #include "bulletMinkowskiSumShape.I" -#endif // __BULLET_MINKOWSKI_SUM_SHAPE_H__ +#endif // BULLETMINKOWSKISUMSHAPE_H diff --git a/panda/src/bullet/bulletMultiSphereShape.h b/panda/src/bullet/bulletMultiSphereShape.h index 2beb123bf5..32f3d52ac9 100644 --- a/panda/src/bullet/bulletMultiSphereShape.h +++ b/panda/src/bullet/bulletMultiSphereShape.h @@ -11,8 +11,8 @@ * @date 2012-01-04 */ -#ifndef __BULLET_MULTI_SPHERE_SHAPE_H__ -#define __BULLET_MULTI_SPHERE_SHAPE_H__ +#ifndef BULLETMULTISPHERESHAPE_H +#define BULLETMULTISPHERESHAPE_H #include "pandabase.h" @@ -81,4 +81,4 @@ private: #include "bulletMultiSphereShape.I" -#endif // __BULLET_MULTI_SPHERE_SHAPE_H__ +#endif // BULLETMULTISPHERESHAPE_H diff --git a/panda/src/bullet/bulletPersistentManifold.h b/panda/src/bullet/bulletPersistentManifold.h index 25feb57493..0b994c6bac 100644 --- a/panda/src/bullet/bulletPersistentManifold.h +++ b/panda/src/bullet/bulletPersistentManifold.h @@ -11,8 +11,8 @@ * @date 2010-03-07 */ -#ifndef __BULLET_PERSISTENT_MANIFOLD_H__ -#define __BULLET_PERSISTENT_MANIFOLD_H__ +#ifndef BULLETPERSISTENTMANIFOLD_H +#define BULLETPERSISTENTMANIFOLD_H #include "pandabase.h" @@ -57,4 +57,4 @@ private: #include "bulletPersistentManifold.I" -#endif // __BULLET_PERSISTENT_MANIFOLD_H__ +#endif // BULLETPERSISTENTMANIFOLD_H diff --git a/panda/src/bullet/bulletPlaneShape.h b/panda/src/bullet/bulletPlaneShape.h index 4521007ecb..5d2d00976f 100644 --- a/panda/src/bullet/bulletPlaneShape.h +++ b/panda/src/bullet/bulletPlaneShape.h @@ -11,8 +11,8 @@ * @date 2010-01-23 */ -#ifndef __BULLET_PLANE_SHAPE_H__ -#define __BULLET_PLANE_SHAPE_H__ +#ifndef BULLETPLANESHAPE_H +#define BULLETPLANESHAPE_H #include "pandabase.h" @@ -84,4 +84,4 @@ private: #include "bulletPlaneShape.I" -#endif // __BULLET_PLANE_SHAPE_H__ +#endif // BULLETPLANESHAPE_H diff --git a/panda/src/bullet/bulletRigidBodyNode.h b/panda/src/bullet/bulletRigidBodyNode.h index 246dec3e6c..6c1879e911 100644 --- a/panda/src/bullet/bulletRigidBodyNode.h +++ b/panda/src/bullet/bulletRigidBodyNode.h @@ -11,8 +11,8 @@ * @date 2010-11-19 */ -#ifndef __BULLET_RIGID_BODY_NODE_H__ -#define __BULLET_RIGID_BODY_NODE_H__ +#ifndef BULLETRIGIDBODYNODE_H +#define BULLETRIGIDBODYNODE_H #include "pandabase.h" @@ -182,4 +182,4 @@ private: #include "bulletRigidBodyNode.I" -#endif // __BULLET_RIGID_BODY_NODE_H__ +#endif // BULLETRIGIDBODYNODE_H diff --git a/panda/src/bullet/bulletRotationalLimitMotor.h b/panda/src/bullet/bulletRotationalLimitMotor.h index d046cd9171..f190663471 100644 --- a/panda/src/bullet/bulletRotationalLimitMotor.h +++ b/panda/src/bullet/bulletRotationalLimitMotor.h @@ -11,8 +11,8 @@ * @date 2013-03-03 */ -#ifndef __BULLET_ROTATIONAL_LIMIT_MOTOR_H__ -#define __BULLET_ROTATIONAL_LIMIT_MOTOR_H__ +#ifndef BULLETROTATIONALLIMITMOTOR_H +#define BULLETROTATIONALLIMITMOTOR_H #include "pandabase.h" @@ -66,4 +66,4 @@ private: #include "bulletRotationalLimitMotor.I" -#endif // __BULLET_ROTATIONAL_LIMIT_MOTOR_H__ +#endif // BULLETROTATIONALLIMITMOTOR_H diff --git a/panda/src/bullet/bulletShape.h b/panda/src/bullet/bulletShape.h index 7b368c987c..69f56feb4e 100644 --- a/panda/src/bullet/bulletShape.h +++ b/panda/src/bullet/bulletShape.h @@ -11,8 +11,8 @@ * @date 2010-01-23 */ -#ifndef __BULLET_SHAPE_H__ -#define __BULLET_SHAPE_H__ +#ifndef BULLETSHAPE_H +#define BULLETSHAPE_H #include "pandabase.h" @@ -45,7 +45,7 @@ PUBLISHED: PN_stdfloat get_margin() const; BoundingSphere get_shape_bounds() const; - + MAKE_PROPERTY(polyhedral, is_polyhedral); MAKE_PROPERTY(convex, is_convex); MAKE_PROPERTY(convex_2d, is_convex_2d); @@ -86,4 +86,4 @@ private: #include "bulletShape.I" -#endif // __BULLET_SHAPE_H__ +#endif // BULLETSHAPE_H diff --git a/panda/src/bullet/bulletSliderConstraint.h b/panda/src/bullet/bulletSliderConstraint.h index 6a670867c5..7ae59293b0 100644 --- a/panda/src/bullet/bulletSliderConstraint.h +++ b/panda/src/bullet/bulletSliderConstraint.h @@ -11,8 +11,8 @@ * @date 2010-03-01 */ -#ifndef __BULLET_SLIDER_CONSTRAINT_H__ -#define __BULLET_SLIDER_CONSTRAINT_H__ +#ifndef BULLETSLIDERCONSTRAINT_H +#define BULLETSLIDERCONSTRAINT_H #include "pandabase.h" @@ -117,4 +117,4 @@ private: #include "bulletSliderConstraint.I" -#endif // __BULLET_SLIDER_CONSTRAINT_H__ +#endif // BULLETSLIDERCONSTRAINT_H diff --git a/panda/src/bullet/bulletSoftBodyConfig.h b/panda/src/bullet/bulletSoftBodyConfig.h index 3d2bf30e42..73986c138b 100644 --- a/panda/src/bullet/bulletSoftBodyConfig.h +++ b/panda/src/bullet/bulletSoftBodyConfig.h @@ -11,8 +11,8 @@ * @date 2010-04-12 */ -#ifndef __BULLET_SOFT_BODY_CONFIG_H__ -#define __BULLET_SOFT_BODY_CONFIG_H__ +#ifndef BULLETSOFTBODYCONFIG_H +#define BULLETSOFTBODYCONFIG_H #include "pandabase.h" @@ -138,4 +138,4 @@ private: #include "bulletSoftBodyConfig.I" -#endif // __BULLET_SOFT_BODY_CONFIG_H__ +#endif // BULLETSOFTBODYCONFIG_H diff --git a/panda/src/bullet/bulletSoftBodyControl.h b/panda/src/bullet/bulletSoftBodyControl.h index 6d1dfdaab9..313c9ca36c 100644 --- a/panda/src/bullet/bulletSoftBodyControl.h +++ b/panda/src/bullet/bulletSoftBodyControl.h @@ -11,8 +11,8 @@ * @date 2010-03-04 */ -#ifndef __BULLET_SOFT_BODY_CONTROL_H__ -#define __BULLET_SOFT_BODY_CONTROL_H__ +#ifndef BULLETSOFTBODYCONTROL_H +#define BULLETSOFTBODYCONTROL_H #include "pandabase.h" @@ -60,4 +60,4 @@ private: #include "bulletSoftBodyControl.I" -#endif // __BULLET_SOFT_BODY_CONTROL_H__ +#endif // BULLETSOFTBODYCONTROL_H diff --git a/panda/src/bullet/bulletSoftBodyMaterial.h b/panda/src/bullet/bulletSoftBodyMaterial.h index 3df77904d8..123edc99ac 100644 --- a/panda/src/bullet/bulletSoftBodyMaterial.h +++ b/panda/src/bullet/bulletSoftBodyMaterial.h @@ -11,8 +11,8 @@ * @date 2011-03-19 */ -#ifndef __BULLET_SOFT_BODY_MATERIAL_H__ -#define __BULLET_SOFT_BODY_MATERIAL_H__ +#ifndef BULLETSOFTBODYMATERIAL_H +#define BULLETSOFTBODYMATERIAL_H #include "pandabase.h" @@ -31,13 +31,13 @@ PUBLISHED: PN_stdfloat get_linear_stiffness() const; void set_linear_stiffness(PN_stdfloat value); - + PN_stdfloat get_angular_stiffness() const; void set_angular_stiffness(PN_stdfloat value); PN_stdfloat get_volume_preservation() const; void set_volume_preservation(PN_stdfloat value); - + MAKE_PROPERTY(linear_stiffness, get_linear_stiffness, set_linear_stiffness); MAKE_PROPERTY(angular_stiffness, get_angular_stiffness, set_angular_stiffness); MAKE_PROPERTY(volume_preservation, get_volume_preservation, set_volume_preservation); @@ -53,4 +53,4 @@ private: #include "bulletSoftBodyMaterial.I" -#endif // __BULLET_SOFT_BODY_MATERIAL_H__ +#endif // BULLETSOFTBODYMATERIAL_H diff --git a/panda/src/bullet/bulletSoftBodyNode.h b/panda/src/bullet/bulletSoftBodyNode.h index e19b6c730f..95e290bc5a 100644 --- a/panda/src/bullet/bulletSoftBodyNode.h +++ b/panda/src/bullet/bulletSoftBodyNode.h @@ -11,8 +11,8 @@ * @date 2010-12-27 */ -#ifndef __BULLET_SOFT_BODY_NODE_H__ -#define __BULLET_SOFT_BODY_NODE_H__ +#ifndef BULLETSOFTBODYNODE_H +#define BULLETSOFTBODYNODE_H #include "pandabase.h" @@ -267,4 +267,4 @@ private: #include "bulletSoftBodyNode.I" -#endif // __BULLET_SOFT_BODY_NODE_H__ +#endif // BULLETSOFTBODYNODE_H diff --git a/panda/src/bullet/bulletSoftBodyShape.h b/panda/src/bullet/bulletSoftBodyShape.h index 85f62df88f..bdb97f0b27 100644 --- a/panda/src/bullet/bulletSoftBodyShape.h +++ b/panda/src/bullet/bulletSoftBodyShape.h @@ -11,8 +11,8 @@ * @date 2010-05-06 */ -#ifndef __BULLET_SOFT_BODY_SHAPE_H__ -#define __BULLET_SOFT_BODY_SHAPE_H__ +#ifndef BULLETSOFTBODYSHAPE_H +#define BULLETSOFTBODYSHAPE_H #include "pandabase.h" @@ -64,4 +64,5 @@ private: #include "bulletSoftBodyShape.I" -#endif // __BULLET_SOFT_BODY_SHAPE_H__ +#endif // BULLETSOFTBODYSHAPE_H + diff --git a/panda/src/bullet/bulletSoftBodyWorldInfo.h b/panda/src/bullet/bulletSoftBodyWorldInfo.h index 5cae2fa0d5..e7247a70de 100644 --- a/panda/src/bullet/bulletSoftBodyWorldInfo.h +++ b/panda/src/bullet/bulletSoftBodyWorldInfo.h @@ -11,8 +11,8 @@ * @date 2010-03-04 */ -#ifndef __BULLET_SOFT_BODY_WORLD_INFO_H__ -#define __BULLET_SOFT_BODY_WORLD_INFO_H__ +#ifndef BULLETSOFTBODYWORLDINFO_H +#define BULLETSOFTBODYWORLDINFO_H #include "pandabase.h" @@ -60,4 +60,4 @@ private: #include "bulletSoftBodyWorldInfo.I" -#endif // __BULLET_SOFT_BODY_WORLD_INFO_H__ +#endif // BULLETSOFTBODYWORLDINFO_H diff --git a/panda/src/bullet/bulletSphereShape.h b/panda/src/bullet/bulletSphereShape.h index e0634d50c2..88da569ff2 100644 --- a/panda/src/bullet/bulletSphereShape.h +++ b/panda/src/bullet/bulletSphereShape.h @@ -11,8 +11,8 @@ * @date 2010-01-23 */ -#ifndef __BULLET_SPHERE_SHAPE_H__ -#define __BULLET_SPHERE_SHAPE_H__ +#ifndef BULLETSPHERESHAPE_H +#define BULLETSPHERESHAPE_H #include "pandabase.h" @@ -79,4 +79,4 @@ private: #include "bulletSphereShape.I" -#endif // __BULLET_SPHERE_SHAPE_H__ +#endif // BULLETSPHERESHAPE_H diff --git a/panda/src/bullet/bulletSphericalConstraint.h b/panda/src/bullet/bulletSphericalConstraint.h index c3eb0a548d..a191caeab7 100644 --- a/panda/src/bullet/bulletSphericalConstraint.h +++ b/panda/src/bullet/bulletSphericalConstraint.h @@ -11,8 +11,8 @@ * @date 2010-03-01 */ -#ifndef __BULLET_SPHERICAL_CONSTRAINT_H__ -#define __BULLET_SPHERICAL_CONSTRAINT_H__ +#ifndef BULLETSPHERICALCONSTRAINT_H +#define BULLETSPHERICALCONSTRAINT_H #include "pandabase.h" @@ -79,4 +79,4 @@ private: #include "bulletSphericalConstraint.I" -#endif // __BULLET_SPHERICAL_CONSTRAINT_H__ +#endif // BULLETSPHERICALCONSTRAINT_H diff --git a/panda/src/bullet/bulletTickCallbackData.h b/panda/src/bullet/bulletTickCallbackData.h index 6218ac237c..cb6014f6dd 100644 --- a/panda/src/bullet/bulletTickCallbackData.h +++ b/panda/src/bullet/bulletTickCallbackData.h @@ -11,8 +11,8 @@ * @date 2012-11-26 */ -#ifndef __BULLET_TICK_CALLBACK_DATA_H__ -#define __BULLET_TICK_CALLBACK_DATA_H__ +#ifndef BULLETTICKCALLBACKDATA_H +#define BULLETTICKCALLBACKDATA_H #include "pandabase.h" #include "callbackData.h" @@ -58,4 +58,4 @@ private: #include "bulletTickCallbackData.I" -#endif // __BULLET_TICK_CALLBACK_DATA_H__ +#endif // BULLETTICKCALLBACKDATA_H diff --git a/panda/src/bullet/bulletTranslationalLimitMotor.h b/panda/src/bullet/bulletTranslationalLimitMotor.h index 97c9909ede..c94d344f0b 100644 --- a/panda/src/bullet/bulletTranslationalLimitMotor.h +++ b/panda/src/bullet/bulletTranslationalLimitMotor.h @@ -11,8 +11,8 @@ * @date 2013-03-03 */ -#ifndef __BULLET_TRANSLATIONAL_LIMIT_MOTOR_H__ -#define __BULLET_TRANSLATIONAL_LIMIT_MOTOR_H__ +#ifndef BULLETTRANSLATIONALLIMITMOTOR_H +#define BULLETTRANSLATIONALLIMITMOTOR_H #include "pandabase.h" @@ -62,4 +62,4 @@ private: #include "bulletTranslationalLimitMotor.I" -#endif // __BULLET_TRANSLATIONAL_LIMIT_MOTOR_H__ +#endif // BULLETTRANSLATIONALLIMITMOTOR_H diff --git a/panda/src/bullet/bulletTriangleMesh.h b/panda/src/bullet/bulletTriangleMesh.h index e3ce0805ad..1af6fe7280 100644 --- a/panda/src/bullet/bulletTriangleMesh.h +++ b/panda/src/bullet/bulletTriangleMesh.h @@ -11,8 +11,8 @@ * @date 2010-02-09 */ -#ifndef __BULLET_TRIANGLE_MESH_H__ -#define __BULLET_TRIANGLE_MESH_H__ +#ifndef BULLETTRIANGLEMESH_H +#define BULLETTRIANGLEMESH_H #include "pandabase.h" @@ -116,4 +116,4 @@ INLINE std::ostream &operator << (std::ostream &out, const BulletTriangleMesh &o #include "bulletTriangleMesh.I" -#endif // __BULLET_TRIANGLE_MESH_H__ +#endif // BULLETTRIANGLEMESH_H diff --git a/panda/src/bullet/bulletTriangleMeshShape.h b/panda/src/bullet/bulletTriangleMeshShape.h index fcfb9281a0..d10720c504 100644 --- a/panda/src/bullet/bulletTriangleMeshShape.h +++ b/panda/src/bullet/bulletTriangleMeshShape.h @@ -11,8 +11,8 @@ * @date 2010-02-09 */ -#ifndef __BULLET_TRIANGLE_MESH_SHAPE_H__ -#define __BULLET_TRIANGLE_MESH_SHAPE_H__ +#ifndef BULLET_TRIANGLE_MESH_SHAPE_H +#define BULLET_TRIANGLE_MESH_SHAPE_H #include "pandabase.h" @@ -93,4 +93,4 @@ private: #include "bulletTriangleMeshShape.I" -#endif // __BULLET_TRIANGLE_MESH_SHAPE_H__ +#endif // BULLET_TRIANGLE_MESH_SHAPE_H diff --git a/panda/src/bullet/bulletVehicle.h b/panda/src/bullet/bulletVehicle.h index 486e38a049..20eb80ac0d 100644 --- a/panda/src/bullet/bulletVehicle.h +++ b/panda/src/bullet/bulletVehicle.h @@ -11,8 +11,8 @@ * @date 2010-02-16 */ -#ifndef __BULLET_VEHICLE_H__ -#define __BULLET_VEHICLE_H__ +#ifndef BULLETVEHICLE_H +#define BULLETVEHICLE_H #include "pandabase.h" @@ -137,4 +137,4 @@ private: #include "bulletVehicle.I" -#endif // __BULLET_VEHICLE_H__ +#endif // BULLETVEHICLE_H diff --git a/panda/src/bullet/bulletWheel.h b/panda/src/bullet/bulletWheel.h index 414ecd94f3..dd349bee9b 100644 --- a/panda/src/bullet/bulletWheel.h +++ b/panda/src/bullet/bulletWheel.h @@ -11,8 +11,8 @@ * @date 2010-02-17 */ -#ifndef __BULLET_WHEEL_H__ -#define __BULLET_WHEEL_H__ +#ifndef BULLETWHEEL_H +#define BULLETWHEEL_H #include "pandabase.h" @@ -151,4 +151,4 @@ private: #include "bulletWheel.I" -#endif // __BULLET_WHEEL_H__ +#endif // BULLETWHEEL_H diff --git a/panda/src/bullet/bulletWorld.h b/panda/src/bullet/bulletWorld.h index 3218f92742..b655e0b349 100644 --- a/panda/src/bullet/bulletWorld.h +++ b/panda/src/bullet/bulletWorld.h @@ -11,8 +11,8 @@ * @date 2010-01-23 */ -#ifndef __BULLET_WORLD_H__ -#define __BULLET_WORLD_H__ +#ifndef BULLETWORLD_H +#define BULLETWORLD_H #include "pandabase.h" @@ -318,4 +318,4 @@ operator >> (std::istream &in, BulletWorld::FilterAlgorithm &algorithm); #include "bulletWorld.I" -#endif // __BULLET_WORLD_H__ +#endif // BULLETWORLD_H diff --git a/panda/src/bullet/bullet_includes.h b/panda/src/bullet/bullet_includes.h index 3b7589469b..ffa672ed92 100644 --- a/panda/src/bullet/bullet_includes.h +++ b/panda/src/bullet/bullet_includes.h @@ -11,8 +11,8 @@ * @date 2010-01-23 */ -#ifndef __BULLET_INCLUDES_H__ -#define __BULLET_INCLUDES_H__ +#ifndef BULLET_INCLUDES_H +#define BULLET_INCLUDES_H #include "pandabase.h" @@ -35,4 +35,4 @@ #include #endif -#endif // __BULLET_INCLUDES_H__ +#endif // BULLET_INCLUDES_H diff --git a/panda/src/bullet/bullet_utils.h b/panda/src/bullet/bullet_utils.h index 080c70986a..5af0060bd0 100644 --- a/panda/src/bullet/bullet_utils.h +++ b/panda/src/bullet/bullet_utils.h @@ -11,8 +11,8 @@ * @date 2010-01-23 */ -#ifndef __BULLET_UTILS_H__ -#define __BULLET_UTILS_H__ +#ifndef BULLET_UTILS_H +#define BULLET_UTILS_H #include "pandabase.h" @@ -62,4 +62,4 @@ END_PUBLISH #include "bullet_utils.I" -#endif // __BULLET_UTILS_H__ +#endif // BULLET_UTILS_H diff --git a/panda/src/bullet/config_bullet.h b/panda/src/bullet/config_bullet.h index 7b8a52e122..b9fe8dcc05 100644 --- a/panda/src/bullet/config_bullet.h +++ b/panda/src/bullet/config_bullet.h @@ -11,8 +11,8 @@ * @date 2010-01-23 */ -#ifndef __CONFIG_BULLET_H__ -#define __CONFIG_BULLET_H__ +#ifndef CONFIG_BULLET_H +#define CONFIG_BULLET_H #include "pandabase.h" #include "notifyCategoryProxy.h" @@ -42,4 +42,4 @@ extern ConfigVariableDouble bullet_additional_damping_angular_threshold; extern EXPCL_PANDABULLET void init_libbullet(); -#endif // __CONFIG_BULLET_H__ +#endif // CONFIG_BULLET_H diff --git a/panda/src/nativenet/buffered_datagramreader.h b/panda/src/nativenet/buffered_datagramreader.h index b500f4c290..3b0df3f681 100644 --- a/panda/src/nativenet/buffered_datagramreader.h +++ b/panda/src/nativenet/buffered_datagramreader.h @@ -1,6 +1,5 @@ -#ifndef __BUFFEREDREADER_GM_H__ -#define __BUFFEREDREADER_GM_H__ - +#ifndef BUFFERED_DATAGRAMREADER_H +#define BUFFERED_DATAGRAMREADER_H #include "ringbuffer.h" #include "datagram.h" @@ -91,4 +90,4 @@ public: #include "buffered_datagramreader.I" -#endif //__BUFFEREDREADER_GM_H__ +#endif // BUFFERED_DATAGRAMREADER_H diff --git a/panda/src/nativenet/buffered_datagramwriter.h b/panda/src/nativenet/buffered_datagramwriter.h index 516aa0dffd..976e9b1810 100644 --- a/panda/src/nativenet/buffered_datagramwriter.h +++ b/panda/src/nativenet/buffered_datagramwriter.h @@ -1,5 +1,5 @@ -#ifndef __BufferedWriter_H__ -#define __BufferedWriter_H__ +#ifndef BufferedWriter_H +#define BufferedWriter_H #include "ringbuffer.h" /** @@ -126,4 +126,4 @@ inline int Buffered_DatagramWriter::AddData(const void * data, size_t len) return answer; } -#endif //__BufferedWriter_H__ +#endif //BufferedWriter_H diff --git a/panda/src/nativenet/membuffer.h b/panda/src/nativenet/membuffer.h index 429dc36ec1..89c7ebdb1c 100644 --- a/panda/src/nativenet/membuffer.h +++ b/panda/src/nativenet/membuffer.h @@ -1,5 +1,5 @@ -#ifndef __MEMBUFFER_GM_H__ -#define __MEMBUFFER_GM_H__ +#ifndef MEMBUFFER_H +#define MEMBUFFER_H class EXPCL_PANDA_NATIVENET MemBuffer { public: @@ -25,4 +25,4 @@ protected: #include "membuffer.I" -#endif //__MEMBUFFER_GM_H__ +#endif // MEMBUFFER_H diff --git a/panda/src/nativenet/ringbuffer.h b/panda/src/nativenet/ringbuffer.h index b821becd9e..4bb91b0185 100644 --- a/panda/src/nativenet/ringbuffer.h +++ b/panda/src/nativenet/ringbuffer.h @@ -1,5 +1,5 @@ -#ifndef __RINGBUFFER_GM_H__ -#define __RINGBUFFER_GM_H__ +#ifndef RINGBUFFER_H +#define RINGBUFFER_H #include "membuffer.h" @@ -30,4 +30,4 @@ public: #include "ringbuffer.I" -#endif //__RINGBUFFER_GM_H__ +#endif // RINGBUFFER_H diff --git a/panda/src/nativenet/socket_base.h b/panda/src/nativenet/socket_base.h index 173118a942..dd81cae15e 100644 --- a/panda/src/nativenet/socket_base.h +++ b/panda/src/nativenet/socket_base.h @@ -1,5 +1,5 @@ -#ifndef __SOCKET_BASE_H__ -#define __SOCKET_BASE_H__ +#ifndef SOCKET_BASE_H +#define SOCKET_BASE_H // Quick way to get all the network code defined #include "pandabase.h" @@ -13,4 +13,4 @@ #include "socket_fdset.h" #include "socket_selector.h" -#endif //__SOCKET_BASE_H__ +#endif //SOCKET_BASE_H diff --git a/panda/src/nativenet/socket_fdset.h b/panda/src/nativenet/socket_fdset.h index 7af32a9d68..670032f509 100644 --- a/panda/src/nativenet/socket_fdset.h +++ b/panda/src/nativenet/socket_fdset.h @@ -1,5 +1,5 @@ -#ifndef __SOCKET_FDSET_H__ -#define __SOCKET_FDSET_H__ +#ifndef SOCKET_FDSET_H +#define SOCKET_FDSET_H /* * rhh This class needs to be broken into 2 classes: the gathering class and @@ -186,4 +186,4 @@ inline int Socket_fdset::WaitForError(bool zeroFds, uint32_t sleep_time) } -#endif //__SOCKET_FDSET_H__ +#endif //SOCKET_FDSET_H diff --git a/panda/src/nativenet/socket_ip.h b/panda/src/nativenet/socket_ip.h index 4b3ab34c7e..e6fc5eeb24 100644 --- a/panda/src/nativenet/socket_ip.h +++ b/panda/src/nativenet/socket_ip.h @@ -1,5 +1,5 @@ -#ifndef __SOCKET_IP_H__ -#define __SOCKET_IP_H__ +#ifndef SOCKET_IP_H +#define SOCKET_IP_H #include "pandabase.h" #include "socket_portable.h" @@ -258,4 +258,4 @@ GetPeerName(void) const { return Socket_Address(name); } -#endif //__SOCKET_IP_H__ +#endif //SOCKET_IP_H diff --git a/panda/src/nativenet/socket_portable.h b/panda/src/nativenet/socket_portable.h index 72f8f6a47d..4000495fe3 100644 --- a/panda/src/nativenet/socket_portable.h +++ b/panda/src/nativenet/socket_portable.h @@ -1,5 +1,5 @@ -#ifndef __SOCKET_PORTABLE_H__ -#define __SOCKET_PORTABLE_H__ +#ifndef SOCKET_PORTABLE_H +#define SOCKET_PORTABLE_H // Lots of stuff to make network socket-based io transparent across multiple // platforms @@ -283,4 +283,4 @@ No Host Type defined !! #error Fatal #endif -#endif //__SOCKET_PORTABLE_H__ +#endif //SOCKET_PORTABLE_H diff --git a/panda/src/nativenet/socket_selector.h b/panda/src/nativenet/socket_selector.h index 3aedf9142b..fcc2fa2123 100644 --- a/panda/src/nativenet/socket_selector.h +++ b/panda/src/nativenet/socket_selector.h @@ -1,5 +1,5 @@ -#ifndef __SOCKET_SELECTOR_H__ -#define __SOCKET_SELECTOR_H__ +#ifndef SOCKET_SELECTOR_H +#define SOCKET_SELECTOR_H // This is a structure on purpose. only used as a helper class to save on // typing @@ -76,4 +76,4 @@ inline int Socket_Selector::WaitFor_Write_Error(const Socket_fdset & fd, const T return WaitFor(timeout); } -#endif //__SOCKET_SELECTOR_H__ +#endif //SOCKET_SELECTOR_H diff --git a/panda/src/nativenet/socket_tcp.h b/panda/src/nativenet/socket_tcp.h index e329a0b147..a44e02fa1a 100644 --- a/panda/src/nativenet/socket_tcp.h +++ b/panda/src/nativenet/socket_tcp.h @@ -1,5 +1,5 @@ -#ifndef __SOCKET_TCP_H__ -#define __SOCKET_TCP_H__ +#ifndef SOCKET_TCP_H +#define SOCKET_TCP_H #include "pandabase.h" #include "socket_ip.h" @@ -222,4 +222,4 @@ SendData(const vector_uchar &data) { return SendData((char *)data.data(), data.size()); } -#endif //__SOCKET_TCP_H__ +#endif //SOCKET_TCP_H diff --git a/panda/src/nativenet/socket_tcp_listen.h b/panda/src/nativenet/socket_tcp_listen.h index 7dc9115402..c0a307f991 100644 --- a/panda/src/nativenet/socket_tcp_listen.h +++ b/panda/src/nativenet/socket_tcp_listen.h @@ -1,5 +1,5 @@ -#ifndef __SOCKET_TCP_LISTEN_H__ -#define __SOCKET_TCP_LISTEN_H__ +#ifndef SOCKET_TCP_LISTEN_H +#define SOCKET_TCP_LISTEN_H #include "pandabase.h" #include "socket_ip.h" @@ -114,4 +114,4 @@ GetIncomingConnection(Socket_TCP &newsession, Socket_Address &address) { return true; } -#endif //__SOCKET_TCP_LISTEN_H__ +#endif //SOCKET_TCP_LISTEN_H diff --git a/panda/src/nativenet/socket_udp.h b/panda/src/nativenet/socket_udp.h index b1d25ffd8a..f86b4074d1 100644 --- a/panda/src/nativenet/socket_udp.h +++ b/panda/src/nativenet/socket_udp.h @@ -11,8 +11,8 @@ * @date 2007-03-01 */ -#ifndef __SOCKET_UDP_H__ -#define __SOCKET_UDP_H__ +#ifndef SOCKET_UDP_H +#define SOCKET_UDP_H #include "socket_udp_incoming.h" #include "vector_uchar.h" @@ -117,4 +117,4 @@ SendTo(const vector_uchar &data, const Socket_Address &address) { return SendTo((char*) data.data(), data.size(), address); } -#endif //__SOCKET_UDP_H__ +#endif //SOCKET_UDP_H diff --git a/panda/src/nativenet/socket_udp_incoming.h b/panda/src/nativenet/socket_udp_incoming.h index cf8454b9d2..fe72ccb230 100644 --- a/panda/src/nativenet/socket_udp_incoming.h +++ b/panda/src/nativenet/socket_udp_incoming.h @@ -1,5 +1,5 @@ -#ifndef __SOCKET_UDP_INCOMING_H__ -#define __SOCKET_UDP_INCOMING_H__ +#ifndef SOCKET_UDP_INCOMING_H +#define SOCKET_UDP_INCOMING_H #include "pandabase.h" #include "socket_ip.h" @@ -186,4 +186,4 @@ SendTo(const char *data, int len, const Socket_Address &address) { return (DO_SOCKET_WRITE_TO(_socket, data, len, &address.GetAddressInfo()) == len); } -#endif //__SOCKET_UDP_INCOMING_H__ +#endif //SOCKET_UDP_INCOMING_H diff --git a/panda/src/nativenet/time_base.h b/panda/src/nativenet/time_base.h index 0aa12baf58..c5c737457e 100644 --- a/panda/src/nativenet/time_base.h +++ b/panda/src/nativenet/time_base.h @@ -1,5 +1,5 @@ -#ifndef __TIME_BASE_H__ -#define __TIME_BASE_H__ +#ifndef TIME_BASE_H +#define TIME_BASE_H /* * Functions To support General Time Managment. And to allow for cross * platform use. Today Really Two Base classes and one convience class @@ -85,4 +85,4 @@ inline int gettimeofday(struct timeval *tv, void * trash) #include "time_general.h" #include "time_out.h" -#endif //__TIME_BASE_H__ +#endif //TIME_BASE_H diff --git a/panda/src/nativenet/time_out.h b/panda/src/nativenet/time_out.h index aceb133393..555bddb161 100644 --- a/panda/src/nativenet/time_out.h +++ b/panda/src/nativenet/time_out.h @@ -1,5 +1,5 @@ -#ifndef __TIME_OUT_H__ -#define __TIME_OUT_H__ +#ifndef TIME_OUT_H +#define TIME_OUT_H // think of this class as a time based alarm.. would be nice to have a // template implementation of this class .. could avoud some storage and some @@ -125,4 +125,4 @@ inline Time_Span Time_Out::Remaining() const return Remaining(Time_Clock::GetCurrentTime()); } -#endif //__TIME_OUT_H__ +#endif //TIME_OUT_H diff --git a/panda/src/nativenet/time_span.h b/panda/src/nativenet/time_span.h index 4633ffef3c..63126f5280 100644 --- a/panda/src/nativenet/time_span.h +++ b/panda/src/nativenet/time_span.h @@ -1,5 +1,5 @@ -#ifndef __TIME_SPAN_H__ -#define __TIME_SPAN_H__ +#ifndef TIME_SPAN_H +#define TIME_SPAN_H /** * @@ -373,4 +373,4 @@ Format(char *pFormat) const { return std::string(szBuffer); } -#endif //__TIME_SPAN_H__ +#endif //TIME_SPAN_H