Skip to content

Removed typedef that depends on nonexistent operator #3

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

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

Removed typedef that depends on nonexistent operator #3

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
18 changes: 8 additions & 10 deletions Source/XnDeviceSensorV2/XnServerSensorInvoker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,6 @@ class XnServerSensorInvoker
XnActualStringProperty* pSharedMemoryName;
} SensorInvokerStream;

typedef XnStringsHashT<SensorInvokerStream> _XnServerStreamsHash;

class XnServerStreamsHash;

class XnLockedServerStreamsHash
Expand All @@ -122,28 +120,28 @@ class XnServerSensorInvoker
this->m_locker = other.m_locker;
return *this;
}

typedef XnStringsHashT<SensorInvokerStream>::Iterator Iterator;

inline _XnServerStreamsHash::Iterator Begin()
inline XnStringsHashT<SensorInvokerStream>::Iterator Begin()
{
return m_hash.Begin();
}

inline _XnServerStreamsHash::Iterator End()
inline XnStringsHashT<SensorInvokerStream>::Iterator End()
{
return m_hash.End();
}

typedef _XnServerStreamsHash::Iterator Iterator;

private:
inline XnLockedServerStreamsHash(_XnServerStreamsHash& hash, XN_CRITICAL_SECTION_HANDLE hLock) :
inline XnLockedServerStreamsHash(XnStringsHashT<SensorInvokerStream>& hash, XN_CRITICAL_SECTION_HANDLE hLock) :
m_hash(hash),
m_locker(hLock)
{}

friend class XnServerSensorInvoker::XnServerStreamsHash;

_XnServerStreamsHash& m_hash;
XnStringsHashT<SensorInvokerStream>& m_hash;
XnAutoCSLocker m_locker;
};

Expand Down Expand Up @@ -187,7 +185,7 @@ class XnServerSensorInvoker

private:
XN_CRITICAL_SECTION_HANDLE m_hLock;
_XnServerStreamsHash m_hash;
XnStringsHashT<SensorInvokerStream> m_hash;
};

// Functions
Expand Down Expand Up @@ -226,4 +224,4 @@ class XnServerSensorInvoker
XnServerStreamsHash m_streams;
};

#endif // __XN_SERVER_SENSOR_INVOKER_H__
#endif // __XN_SERVER_SENSOR_INVOKER_H__