From 6f8b39657587bdc011b26f151b9a84544de84d91 Mon Sep 17 00:00:00 2001
From: "erwin.coumans" <erwin.coumans@08e121b0-ae19-0410-a57b-3be3395fd4fd>
Date: Mon, 14 Jul 2008 17:19:50 +0000
Subject: [PATCH] use different namespace for SPU version of btGjkEpa2 to avoid
 name clashes.

---
 .../SpuNarrowPhaseCollisionTask/SpuGjkEpa2.cpp                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGjkEpa2.cpp b/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGjkEpa2.cpp
index b9369a650..58163efa8 100644
--- a/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGjkEpa2.cpp
+++ b/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGjkEpa2.cpp
@@ -11,7 +11,7 @@
 #endif //__SPU__
 #endif
 
-namespace gjkepa2_impl
+namespace gjkepa2_spu_impl
 {
 
 // Config
@@ -778,7 +778,7 @@ shape.EnableMargin(withmargins);
 // Api
 //
 
-using namespace	gjkepa2_impl;
+using namespace	gjkepa2_spu_impl;
 
 //
 int			SpuGjkEpaSolver2::StackSizeRequirement()