From 74b1044a05b35e3ea2be5849da7084cb9237cd73 Mon Sep 17 00:00:00 2001
From: nicolaichuk <nicolaichuk@gmail.com>
Date: Thu, 23 Mar 2017 14:14:14 +0300
Subject: [PATCH] move constructor for abstract class in protected

---
 .../BroadphaseCollision/btBroadphaseInterface.h               | 4 ++++
 .../BroadphaseCollision/btOverlappingPairCallback.h           | 3 +++
 .../CollisionDispatch/btActivatingCollisionAlgorithm.h        | 3 ++-
 src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h | 4 +++-
 .../btDiscreteCollisionDetectorInterface.h                    | 4 +++-
 src/BulletDynamics/ConstraintSolver/btContactConstraint.h     | 4 +++-
 6 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h b/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
index d31b77f46..fb68e0024 100644
--- a/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
+++ b/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
@@ -41,6 +41,10 @@ struct	btBroadphaseRayCallback : public btBroadphaseAabbCallback
 	btScalar		m_lambda_max;
 
 	virtual ~btBroadphaseRayCallback() {}
+	
+protected:
+    
+    btBroadphaseRayCallback() {}
 };
 
 #include "LinearMath/btVector3.h"
diff --git a/src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h b/src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h
index 9c7b6f813..3e069fa5e 100644
--- a/src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h
+++ b/src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h
@@ -23,6 +23,9 @@ struct  btBroadphasePair;
 ///The btOverlappingPairCallback class is an additional optional broadphase user callback for adding/removing overlapping pairs, similar interface to btOverlappingPairCache.
 class btOverlappingPairCallback
 {
+protected:
+    btOverlappingPairCallback() {}
+    
 public:
 	virtual ~btOverlappingPairCallback()
 	{
diff --git a/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h b/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h
index 489812b96..0e19f1ea3 100644
--- a/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h
+++ b/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h
@@ -24,12 +24,13 @@ class btActivatingCollisionAlgorithm : public btCollisionAlgorithm
 //	btCollisionObject* m_colObj0;
 //	btCollisionObject* m_colObj1;
 
-public:
+protected:
 
 	btActivatingCollisionAlgorithm (const btCollisionAlgorithmConstructionInfo& ci);
 
 	btActivatingCollisionAlgorithm (const btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap,const btCollisionObjectWrapper* body1Wrap);
 
+public:
 	virtual ~btActivatingCollisionAlgorithm();
 
 };
diff --git a/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h b/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
index 961d001a9..7bf8e01c1 100644
--- a/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
+++ b/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
@@ -93,10 +93,12 @@ protected:
 		aabbMax = m_localAabbMax;
 	}
 
-public:
+protected:
 
 	btPolyhedralConvexAabbCachingShape();
 	
+public:
+	
 	inline void getNonvirtualAabb(const btTransform& trans,btVector3& aabbMin,btVector3& aabbMax, btScalar margin) const
 	{
 
diff --git a/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h b/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
index 46ce1ab75..0ea7b483c 100644
--- a/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
+++ b/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
@@ -67,10 +67,12 @@ struct btStorageResult : public btDiscreteCollisionDetectorInterface::Result
 		btVector3	m_closestPointInB;
 		btScalar	m_distance; //negative means penetration !
 
+    protected:
 		btStorageResult() : m_distance(btScalar(BT_LARGE_FLOAT))
 		{
-
 		}
+		
+	public:
 		virtual ~btStorageResult() {};
 
 		virtual void addContactPoint(const btVector3& normalOnBInWorld,const btVector3& pointInWorld,btScalar depth)
diff --git a/src/BulletDynamics/ConstraintSolver/btContactConstraint.h b/src/BulletDynamics/ConstraintSolver/btContactConstraint.h
index 477c79d17..adb226835 100644
--- a/src/BulletDynamics/ConstraintSolver/btContactConstraint.h
+++ b/src/BulletDynamics/ConstraintSolver/btContactConstraint.h
@@ -28,11 +28,13 @@ protected:
 
 	btPersistentManifold m_contactManifold;
 
-public:
+protected:
 
 
 	btContactConstraint(btPersistentManifold* contactManifold,btRigidBody& rbA,btRigidBody& rbB);
 
+public:
+
 	void	setContactManifold(btPersistentManifold* contactManifold);
 
 	btPersistentManifold* getContactManifold()