diff --git a/Source/XnDeviceSensorV2/XnServerSensorInvoker.h b/Source/XnDeviceSensorV2/XnServerSensorInvoker.h index 63e2c2e..fd77166 100644 --- a/Source/XnDeviceSensorV2/XnServerSensorInvoker.h +++ b/Source/XnDeviceSensorV2/XnServerSensorInvoker.h @@ -104,8 +104,6 @@ class XnServerSensorInvoker XnActualStringProperty* pSharedMemoryName; } SensorInvokerStream; - typedef XnStringsHashT _XnServerStreamsHash; - class XnServerStreamsHash; class XnLockedServerStreamsHash @@ -122,28 +120,28 @@ class XnServerSensorInvoker this->m_locker = other.m_locker; return *this; } + + typedef XnStringsHashT::Iterator Iterator; - inline _XnServerStreamsHash::Iterator Begin() + inline XnStringsHashT::Iterator Begin() { return m_hash.Begin(); } - inline _XnServerStreamsHash::Iterator End() + inline XnStringsHashT::Iterator End() { return m_hash.End(); } - typedef _XnServerStreamsHash::Iterator Iterator; - private: - inline XnLockedServerStreamsHash(_XnServerStreamsHash& hash, XN_CRITICAL_SECTION_HANDLE hLock) : + inline XnLockedServerStreamsHash(XnStringsHashT& hash, XN_CRITICAL_SECTION_HANDLE hLock) : m_hash(hash), m_locker(hLock) {} friend class XnServerSensorInvoker::XnServerStreamsHash; - _XnServerStreamsHash& m_hash; + XnStringsHashT& m_hash; XnAutoCSLocker m_locker; }; @@ -187,7 +185,7 @@ class XnServerSensorInvoker private: XN_CRITICAL_SECTION_HANDLE m_hLock; - _XnServerStreamsHash m_hash; + XnStringsHashT m_hash; }; // Functions @@ -226,4 +224,4 @@ class XnServerSensorInvoker XnServerStreamsHash m_streams; }; -#endif // __XN_SERVER_SENSOR_INVOKER_H__ \ No newline at end of file +#endif // __XN_SERVER_SENSOR_INVOKER_H__