From 49fa5ea692560b746f6ddb9e3b4089139314d85c Mon Sep 17 00:00:00 2001 From: Masaki Waga Date: Tue, 26 Mar 2013 19:55:47 +0900 Subject: [PATCH 1/3] OldGccProblem modified in XnOniFramePool.h --- Source/Drivers/PS1080/DDK/XnOniFramePool.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Drivers/PS1080/DDK/XnOniFramePool.h b/Source/Drivers/PS1080/DDK/XnOniFramePool.h index 8273ce47..f29de3ea 100644 --- a/Source/Drivers/PS1080/DDK/XnOniFramePool.h +++ b/Source/Drivers/PS1080/DDK/XnOniFramePool.h @@ -41,8 +41,8 @@ typedef struct class XnOniFramePool : public xnl::Pool { -public: - XnOniFramePool() : Pool(true), m_frameSize(0) + public: + XnOniFramePool() : xnl::Pool::Pool(true), m_frameSize(0) { } @@ -58,7 +58,7 @@ class XnOniFramePool : public xnl::Pool Lock(); // Try to release the frame. - XnStatus nRetVal = Pool::Release(pFrame); + XnStatus nRetVal = xnl::Pool::Release(pFrame); if (nRetVal == XN_STATUS_OK) { // Check if frame requires resize. From 94edc442440edf74c16b94e9c75dc4e139f8f28c Mon Sep 17 00:00:00 2001 From: Masaki Waga Date: Wed, 27 Mar 2013 11:09:42 +0900 Subject: [PATCH 2/3] cast(?) that is not permitted in old gcc modified --- Source/Drivers/PS1080/DDK/XnDeviceBase.h | 2 +- Source/Drivers/PS1080/DDK/XnFrameBufferManager.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Drivers/PS1080/DDK/XnDeviceBase.h b/Source/Drivers/PS1080/DDK/XnDeviceBase.h index c9e740be..b5160fdc 100644 --- a/Source/Drivers/PS1080/DDK/XnDeviceBase.h +++ b/Source/Drivers/PS1080/DDK/XnDeviceBase.h @@ -101,7 +101,7 @@ class XnDeviceBase virtual XnStatus UnregisterFromPropertyChange(const XnChar* Module, XnUInt32 propertyId, XnCallbackHandle hCallback); typedef xnl::Event NewStreamDataEvent; - NewStreamDataEvent::EventInterface& OnNewStreamDataEvent() { return m_OnNewStreamDataEvent; } + NewStreamDataEvent/* ::EventInterface */& OnNewStreamDataEvent() { return m_OnNewStreamDataEvent; } /** * Finds a stream (a module which has the IS_STREAM property set to TRUE). diff --git a/Source/Drivers/PS1080/DDK/XnFrameBufferManager.h b/Source/Drivers/PS1080/DDK/XnFrameBufferManager.h index f1814d59..326a5756 100644 --- a/Source/Drivers/PS1080/DDK/XnFrameBufferManager.h +++ b/Source/Drivers/PS1080/DDK/XnFrameBufferManager.h @@ -68,7 +68,7 @@ class XnFrameBufferManager } NewFrameEventArgs; typedef xnl::Event NewFrameEvent; - NewFrameEvent::EventInterface& OnNewFrameEvent() { return m_NewFrameEvent; } + NewFrameEvent/* ::EventInterface */& OnNewFrameEvent() { return m_NewFrameEvent; } private: XnOniFramePool* m_pBufferPool; @@ -79,4 +79,4 @@ class XnFrameBufferManager XnBuffer m_writeBuffer; }; -#endif //__XN_MULTI_FRAME_BUFFER_H__ \ No newline at end of file +#endif //__XN_MULTI_FRAME_BUFFER_H__ From 2e6d82df7e1ff1a34f2a877a4e398453966463af Mon Sep 17 00:00:00 2001 From: Masaki Waga Date: Wed, 27 Mar 2013 13:07:38 +0900 Subject: [PATCH 3/3] patch4sse2 added --- ThirdParty/PSCommon/BuildSystem/patch4sse2 | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 ThirdParty/PSCommon/BuildSystem/patch4sse2 diff --git a/ThirdParty/PSCommon/BuildSystem/patch4sse2 b/ThirdParty/PSCommon/BuildSystem/patch4sse2 new file mode 100644 index 00000000..b9e7c63a --- /dev/null +++ b/ThirdParty/PSCommon/BuildSystem/patch4sse2 @@ -0,0 +1,7 @@ +*** /dev/null +--- /dev/null +*************** +*** 5 +- SSE_GENERATION = 3 +--- 5 ----- ++ SSE_GENERATION = 2