Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10156 from vovkasm/fix-warnings 

Fix warnings
This commit is contained in:
minggo 2015-01-21 20:23:00 +08:00
parent 0f46dec0c8 6e01cab380
commit 954f372775
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/3d/CCFrustum.h
View File

@ -41,7 +41,7 @@ public:
/** /**
* Constructor & Destructor. * Constructor & Destructor.
*/ */
Frustum(): _initialized(false), _clipZ(true){} Frustum(): _clipZ(true), _initialized(false) {}
~Frustum(){} ~Frustum(){}
/** /**

8
cocos/base/CCConsole.cpp
View File

@ -202,10 +202,10 @@ static const char* inet_ntop(int af, const void* src, char* dst, int cnt)
} }
#endif #endif
#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
static const int CCLOG_STRING_TAG = 1; static const int CCLOG_STRING_TAG = 1;
void SendLogToWindow(const char *log) void SendLogToWindow(const char *log)
{ {
#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
// Send data as a message // Send data as a message
COPYDATASTRUCT myCDS; COPYDATASTRUCT myCDS;
myCDS.dwData = CCLOG_STRING_TAG; myCDS.dwData = CCLOG_STRING_TAG;
@ -219,8 +219,12 @@ void SendLogToWindow(const char *log)
(WPARAM)(HWND)hwnd, (WPARAM)(HWND)hwnd,
(LPARAM)(LPVOID)&myCDS); (LPARAM)(LPVOID)&myCDS);
} }
#endif
} }
#else
void SendLogToWindow(const char *log)
{
}
#endif
// //
// Free functions to log // Free functions to log

4
cocos/physics/CCPhysicsBody.cpp
View File

@ -68,11 +68,11 @@ PhysicsBody::PhysicsBody()
, _linearDamping(0.0f) , _linearDamping(0.0f)
, _angularDamping(0.0f) , _angularDamping(0.0f)
, _tag(0) , _tag(0)
, _rotationOffset(0) , _positionInitDirty(true)
, _recordedPosition(Vec2::ZERO) , _recordedPosition(Vec2::ZERO)
, _rotationOffset(0)
, _recordedRotation(0.0f) , _recordedRotation(0.0f)
, _recordedAngle(0.0) , _recordedAngle(0.0)
, _positionInitDirty(true)
{ {
} }

2
cocos/physics/CCPhysicsJoint.cpp
View File

@ -40,9 +40,9 @@ PhysicsJoint::PhysicsJoint()
, _enable(false) , _enable(false)
, _collisionEnable(true) , _collisionEnable(true)
, _destoryMark(false) , _destoryMark(false)
, _initDirty(true)
, _tag(0) , _tag(0)
, _maxForce(PHYSICS_INFINITY) , _maxForce(PHYSICS_INFINITY)
, _initDirty(true)
{ {
} }