Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compile issues on old GCC #16

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Compile issues on old GCC #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
49fa5ea
OldGccProblem modified in XnOniFramePool.h
MasWag Mar 26, 2013
94edc44
cast(?) that is not permitted in old gcc modified
MasWag Mar 27, 2013
2e6d82d
patch4sse2 added
MasWag Mar 27, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Source/Drivers/PS1080/DDK/XnDeviceBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class XnDeviceBase
virtual XnStatus UnregisterFromPropertyChange(const XnChar* Module, XnUInt32 propertyId, XnCallbackHandle hCallback);

typedef xnl::Event<XnNewStreamDataEventArgs> 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).
Expand Down
4 changes: 2 additions & 2 deletions Source/Drivers/PS1080/DDK/XnFrameBufferManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class XnFrameBufferManager
} NewFrameEventArgs;

typedef xnl::Event<NewFrameEventArgs> NewFrameEvent;
NewFrameEvent::EventInterface& OnNewFrameEvent() { return m_NewFrameEvent; }
NewFrameEvent/* ::EventInterface */& OnNewFrameEvent() { return m_NewFrameEvent; }

private:
XnOniFramePool* m_pBufferPool;
Expand All @@ -79,4 +79,4 @@ class XnFrameBufferManager
XnBuffer m_writeBuffer;
};

#endif //__XN_MULTI_FRAME_BUFFER_H__
#endif //__XN_MULTI_FRAME_BUFFER_H__
6 changes: 3 additions & 3 deletions Source/Drivers/PS1080/DDK/XnOniFramePool.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ typedef struct

class XnOniFramePool : public xnl::Pool<OniFrame>
{
public:
XnOniFramePool() : Pool(true), m_frameSize(0)
public:
XnOniFramePool() : xnl::Pool<OniFrame>::Pool(true), m_frameSize(0)
{
}

Expand All @@ -58,7 +58,7 @@ class XnOniFramePool : public xnl::Pool<OniFrame>
Lock();

// Try to release the frame.
XnStatus nRetVal = Pool::Release(pFrame);
XnStatus nRetVal = xnl::Pool<OniFrame>::Release(pFrame);
if (nRetVal == XN_STATUS_OK)
{
// Check if frame requires resize.
Expand Down
7 changes: 7 additions & 0 deletions ThirdParty/PSCommon/BuildSystem/patch4sse2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
*** /dev/null
--- /dev/null
***************
*** 5
- SSE_GENERATION = 3
--- 5 -----
+ SSE_GENERATION = 2