From 72b68409da17cb54ffc406a337510a7f17a4792f Mon Sep 17 00:00:00 2001
From: Erwin Coumans <erwin.coumans@gmail.com>
Date: Sun, 8 Nov 2015 13:49:37 -0800
Subject: [PATCH] clang gets confused/crashes when using the same namespace,
 need to look if it is a real error or clang issue should fix Issue 520
 https://github.com/bulletphysics/bullet3/issues/520

---
 build3/premake4.lua                                 | 1 +
 src/Bullet3OpenCL/NarrowphaseCollision/b3GjkEpa.cpp | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build3/premake4.lua b/build3/premake4.lua
index cba296b34..a3f020cba 100644
--- a/build3/premake4.lua
+++ b/build3/premake4.lua
@@ -128,6 +128,7 @@
 			{
         		'ARCHS = "$(ARCHS_STANDARD_32_BIT) $(ARCHS_STANDARD_64_BIT)"',
         		'VALID_ARCHS = "x86_64 i386"',
+--			'SDKROOT = "macosx10.9"',
 			}
 			end
 	end
diff --git a/src/Bullet3OpenCL/NarrowphaseCollision/b3GjkEpa.cpp b/src/Bullet3OpenCL/NarrowphaseCollision/b3GjkEpa.cpp
index b96844c7c..811f6a11f 100644
--- a/src/Bullet3OpenCL/NarrowphaseCollision/b3GjkEpa.cpp
+++ b/src/Bullet3OpenCL/NarrowphaseCollision/b3GjkEpa.cpp
@@ -27,7 +27,7 @@ GJK-EPA collision solver by Nathanael Presson, 2008
 
 #include "b3SupportMappings.h"
 
-namespace gjkepa2_impl
+namespace gjkepa2_impl2
 {
 
 	// Config
@@ -832,7 +832,7 @@ namespace gjkepa2_impl
 // Api
 //
 
-using namespace	gjkepa2_impl;
+using namespace	gjkepa2_impl2;
 
 //
 int			b3GjkEpaSolver2::StackSizeRequirement()