Context Navigation

Changeset 10726 for code/trunk/src

Timestamp:

Oct 30, 2015, 11:52:18 PM (8 years ago)

Author:

landauf

Message:

fixed alignment warnings in MSVC14 (caused by SSE instructions in bullet)

Location:

code/trunk/src

Files:

r8393	r10726
64	64
65	65	public:
	66	BT_DECLARE_ALIGNED_ALLOCATOR();
66	67
67	68	enum DispatcherFlags

r8393	r10726
32	32
33	33	public:
	34	BT_DECLARE_ALIGNED_ALLOCATOR();
	35
34	36	btStaticPlaneShape(const btVector3& planeNormal,btScalar planeConstant);
35	37

r8393	r10726
23	23
24	24	///btContactConstraint can be automatically created to solve contact constraints using the unified btTypedConstraint interface
25		ATTRIBUTE_ALIGNED16(class) btContactConstraint : public btTypedConstraint
	25	ATTRIBUTE_ALIGNED128(class) btContactConstraint : public btTypedConstraint
26	26	{
27	27	protected:

r8393	r10726
83	83
84	84	public:
	85
	86	BT_DECLARE_ALIGNED_ALLOCATOR();
85	87
86	88

-                      r10288
+                      r10726
 #endif
 #include <LinearMath/btMotionState.h>
+#include <LinearMath/btAlignedAllocator.h>
 #include "util/Math.h"
 …
         public:
+            BT_DECLARE_ALIGNED_ALLOCATOR();
             // Define our own transform space enum to avoid Ogre includes here
             /**

Note: See TracChangeset for help on using the changeset viewer.