From 48f6484b3d3069eb93b9dce0363151040243aa42 Mon Sep 17 00:00:00 2001
From: = <=>
Date: Tue, 14 Jul 2015 16:23:01 -0700
Subject: [PATCH] make OSX/Unix version of PosixSharedMemory work pass on
 useFixedBase to URDF loader in PhysicsServer

---
 examples/SharedMemory/PhysicsServer.cpp     | 2 +-
 examples/SharedMemory/PosixSharedMemory.cpp | 2 +-
 examples/SharedMemory/PosixSharedMemory.h   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/SharedMemory/PhysicsServer.cpp b/examples/SharedMemory/PhysicsServer.cpp
index 564820aac..9580c6a33 100644
--- a/examples/SharedMemory/PhysicsServer.cpp
+++ b/examples/SharedMemory/PhysicsServer.cpp
@@ -202,7 +202,7 @@ bool PhysicsServerSharedMemory::loadUrdf(const char* fileName, const btVector3&
 
     BulletURDFImporter u2b(m_data->m_guiHelper);
 
-    bool loadOk =  u2b.loadURDF(fileName);
+    bool loadOk =  u2b.loadURDF(fileName, useFixedBase);
     if (loadOk)
     {
         b3Printf("loaded %s OK!", fileName);
diff --git a/examples/SharedMemory/PosixSharedMemory.cpp b/examples/SharedMemory/PosixSharedMemory.cpp
index 5289db5f6..3bf0165dc 100644
--- a/examples/SharedMemory/PosixSharedMemory.cpp
+++ b/examples/SharedMemory/PosixSharedMemory.cpp
@@ -40,7 +40,7 @@ struct btPointerCaster
     };
 };
 
-void*   PosixSharedMemory::allocateSharedMemory(int key, int size)
+void*   PosixSharedMemory::allocateSharedMemory(int key, int size,  bool /*allowCreation*/)
 {
 #ifdef TEST_SHARED_MEMORY
     int flags = IPC_CREAT | 0666;
diff --git a/examples/SharedMemory/PosixSharedMemory.h b/examples/SharedMemory/PosixSharedMemory.h
index 479e4e504..062b001ad 100644
--- a/examples/SharedMemory/PosixSharedMemory.h
+++ b/examples/SharedMemory/PosixSharedMemory.h
@@ -14,7 +14,7 @@ public:
     PosixSharedMemory();
     virtual ~PosixSharedMemory();
 
-    virtual void*   allocateSharedMemory(int key, int size);
+    virtual void*   allocateSharedMemory(int key, int size, bool allowCreation);
     virtual void releaseSharedMemory(int key, int size);
 };