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

Fixes for compiling under OSX 10.8 with clang #35

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes for compiling under OSX 10.8 with clang #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions Source/Drivers/PS1080/DDK/XnPixelStream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ class XnPixelStream : public XnFrameStream
XnGeneralProperty m_SupportedModes;

xnl::Array<XnCmosPreset> m_supportedModesData;
protected:
XnBool m_bAllowCustomResolutions;
};

Expand Down
4 changes: 2 additions & 2 deletions Source/Drivers/PS1080/Sensor/XnDeviceSensorIO.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ class XnSensorIO
XnBool m_bMiscSupported;
XnChar m_strDeviceName[XN_DEVICE_MAX_STRING_LENGTH];
XnBool m_bIsLowBandwidth;
XnUSBEventCallbackFunctionPtr m_pCallbackPtr;
void* m_pCallbackData;
//XnUSBEventCallbackFunctionPtr m_pCallbackPtr; //private field is not used, clashes with clang due to [-Werror,-Wunused-private-field]
//void* m_pCallbackData; //private field is not used, clashes with clang due to [-Werror,-Wunused-private-field]
};

#endif //__XN_DEVICE_SENSOR_I_O_H__
4 changes: 3 additions & 1 deletion Source/Drivers/PSLink/LinkProtoLib/XnClientUSBConnectionFactory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ class ClientUSBConnectionFactory : public IConnectionFactory
private:
XnUInt16 m_nInputConnections;
XnUInt16 m_nOutputConnections;
XnUInt32 m_nPreControlReceiveSleep;
protected:
XnUInt32 m_nPreControlReceiveSleep; //if private and field not used, it clashes with clang due to [-Werror,-Wunused-private-field]
private:
XnUInt8 m_nAltInterface;

ClientUSBControlEndpoint m_controlEndpoint;
Expand Down
3 changes: 2 additions & 1 deletion Source/Drivers/PSLink/LinkProtoLib/XnLink6BitParser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ class Link6BitParser : public LinkMsgParser

private:
XnUInt32 m_nState;
XnUInt16 m_nShift;
protected:
XnUInt16 m_nShift; //if private and field not used, it clashes with clang due to [-Werror,-Wunused-private-field]
};

}
Expand Down
2 changes: 1 addition & 1 deletion Source/Drivers/PSLink/PrimeClient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ class PrimeClient :
XnBool m_bInitialized;
volatile XnBool m_bConnected;
xnl::Array<LinkInputDataEndpoint> m_inputDataEndpoints;
XnBool m_bAnyDataEndpointConnected;
//XnBool m_bAnyDataEndpointConnected; //private field is not used, clashes with clang due to [-Werror,-Wunused-private-field]
XnUInt16 m_nFWLogStreamID;
XnChar m_strConnectionString[XN_FILE_MAX_PATH];

Expand Down