From a00af9d8984b36668976cd9817abbb0bbffff7f2 Mon Sep 17 00:00:00 2001
From: erwin coumans <erwin.coumans@gmail.com>
Date: Sat, 20 Apr 2013 11:20:27 -0700
Subject: [PATCH] fixes to prepare for CPU dynamics bvh broadphase

---
 demo/donttouch/GpuDemo.h              | 2 +-
 demo/donttouch/btCpuDynamicsWorld.cpp | 2 +-
 demo/donttouch/btCpuDynamicsWorld.h   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/demo/donttouch/GpuDemo.h b/demo/donttouch/GpuDemo.h
index 96bdc133e..4e06e36bd 100644
--- a/demo/donttouch/GpuDemo.h
+++ b/demo/donttouch/GpuDemo.h
@@ -21,7 +21,7 @@ subject to the following restrictions:
 
 class btBroadphaseInterface;
 class btCollisionShape;
-class btOverlappingPairCache;
+class b3OverlappingPairCache;
 class btCollisionDispatcher;
 class btConstraintSolver;
 struct btCollisionAlgorithmCreateFunc;
diff --git a/demo/donttouch/btCpuDynamicsWorld.cpp b/demo/donttouch/btCpuDynamicsWorld.cpp
index 16111397f..4af87c5d3 100644
--- a/demo/donttouch/btCpuDynamicsWorld.cpp
+++ b/demo/donttouch/btCpuDynamicsWorld.cpp
@@ -5,7 +5,7 @@
 btCpuDynamicsWorld::btCpuDynamicsWorld()
 	:btDiscreteDynamicsWorld(
 			new btCollisionDispatcher(new btDefaultCollisionConfiguration()),
-			new btDbvtBroadphase(),new btSequentialImpulseConstraintSolver(),
+			new b3DynamicBvhBroadphase(),new btSequentialImpulseConstraintSolver(),
 			new btDefaultCollisionConfiguration()//todo: remove this!
 			)
 {
diff --git a/demo/donttouch/btCpuDynamicsWorld.h b/demo/donttouch/btCpuDynamicsWorld.h
index b8a47d8f7..150ae65c1 100644
--- a/demo/donttouch/btCpuDynamicsWorld.h
+++ b/demo/donttouch/btCpuDynamicsWorld.h
@@ -4,7 +4,7 @@
 
 class btDefaultCollisionConfiguration;
 class btCollisionDispatcher;
-struct btDbvtBroadphase;
+struct b3DynamicBvhBroadphase;
 class btSequentialImpulseConstraintSolver;
 
 #include "BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h"