From d37379ddc33c8602823536954246b5a4daff3cc1 Mon Sep 17 00:00:00 2001 From: erwincoumans Date: Fri, 6 Jan 2017 14:53:10 -0800 Subject: [PATCH 1/2] remove an extra quote in the BulletMJCFImporter.cpp --- examples/Importers/ImportMJCFDemo/BulletMJCFImporter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/Importers/ImportMJCFDemo/BulletMJCFImporter.cpp b/examples/Importers/ImportMJCFDemo/BulletMJCFImporter.cpp index 1e52a572d..941295c47 100644 --- a/examples/Importers/ImportMJCFDemo/BulletMJCFImporter.cpp +++ b/examples/Importers/ImportMJCFDemo/BulletMJCFImporter.cpp @@ -11,7 +11,7 @@ #include "BulletCollision/CollisionShapes/btCompoundShape.h" #include "BulletCollision/CollisionShapes/btStaticPlaneShape.h" -#include "BulletCollision/CollisionShapes/btBoxShape.h"" +#include "BulletCollision/CollisionShapes/btBoxShape.h" #include "BulletCollision/CollisionShapes/btSphereShape.h" #include "BulletCollision/CollisionShapes/btCapsuleShape.h" #include "BulletCollision/CollisionShapes/btCylinderShape.h" From 10c7ddcb152881e377ecc8beec420f9e27ee342e Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Fri, 6 Jan 2017 18:15:04 -0800 Subject: [PATCH 2/2] fix issue of duplicate classes with same name causing issues with some linkers --- .../GwenGUISupport/GwenProfileWindow.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/examples/ExampleBrowser/GwenGUISupport/GwenProfileWindow.cpp b/examples/ExampleBrowser/GwenGUISupport/GwenProfileWindow.cpp index dc449c987..c23554f41 100644 --- a/examples/ExampleBrowser/GwenGUISupport/GwenProfileWindow.cpp +++ b/examples/ExampleBrowser/GwenGUISupport/GwenProfileWindow.cpp @@ -45,7 +45,7 @@ public: CProfileIterator* profIter; - class MyMenuItems* m_menuItems; + class MyMenuItems3* m_menuItems; MyProfileWindow ( Gwen::Controls::Base* pParent) : Gwen::Controls::WindowControl( pParent ), profIter(0) @@ -247,16 +247,17 @@ public: }; -class MyMenuItems : public Gwen::Controls::Base +class MyMenuItems3 : public Gwen::Controls::Base { public: class MyProfileWindow* m_profWindow; - MyMenuItems() :Gwen::Controls::Base(0) + MyMenuItems3() :Gwen::Controls::Base(0) { } - + virtual ~MyMenuItems3() {} + void MenuItemSelect(Gwen::Controls::Base* pControl) { if (m_profWindow->Hidden()) @@ -273,14 +274,14 @@ public: MyProfileWindow* setupProfileWindow(GwenInternalData* data) { - MyMenuItems* menuItems = new MyMenuItems; + MyMenuItems3* menuItems = new MyMenuItems3; MyProfileWindow* profWindow = new MyProfileWindow(data->pCanvas); //profWindow->SetHidden(true); profWindow->m_menuItems = menuItems; profWindow->profIter = CProfileManager::Get_Iterator(); - data->m_viewMenu->GetMenu()->AddItem( L"Profiler", menuItems,(Gwen::Event::Handler::Function)&MyMenuItems::MenuItemSelect); + data->m_viewMenu->GetMenu()->AddItem( L"Profiler", menuItems,(Gwen::Event::Handler::Function)&MyMenuItems3::MenuItemSelect); menuItems->m_profWindow = profWindow; @@ -312,4 +313,4 @@ void destroyProfileWindow(MyProfileWindow* window) delete window; } -#endif //BT_NO_PROFILE \ No newline at end of file +#endif //BT_NO_PROFILE