Skip to content

Commit 00f3777

Browse files
committed
[LINT] error 1516
Warning -- Member declaration hides inherited member 'NppPythonScript::PyProducerConsumer< std::basic_string< char, std::char_traits<char>, std::allocator<char>>>::m_hThread' Signed-off-by: Jocelyn Legault <jocelynlegault@gmail.com>
1 parent 4763ae8 commit 00f3777

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

PythonScript/src/PyProducerConsumer.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class PyProducerConsumer
2828
HANDLE m_shutdown;
2929
std::queue<std::shared_ptr<DataT> > m_queue;
3030
DWORD m_dwThreadId;
31-
HANDLE m_hThread;
31+
HANDLE m_hConsumerThread;
3232
bool m_consuming;
3333

3434
void consumer();
@@ -39,7 +39,7 @@ class PyProducerConsumer
3939

4040
template <typename DataT>
4141
PyProducerConsumer<DataT>::PyProducerConsumer()
42-
: m_hThread(NULL),
42+
: m_hConsumerThread(NULL),
4343
m_dwThreadId(NULL),
4444
m_consuming(false)
4545
{
@@ -67,11 +67,11 @@ template <typename DataT>
6767
void PyProducerConsumer<DataT>::stopConsumer()
6868
{
6969
SetEvent(m_shutdown);
70-
if (m_hThread)
70+
if (m_hConsumerThread)
7171
{
72-
WaitForSingleObject(m_hThread, INFINITE);
73-
CloseHandle(m_hThread);
74-
m_hThread = NULL;
72+
WaitForSingleObject(m_hConsumerThread, INFINITE);
73+
CloseHandle(m_hConsumerThread);
74+
m_hConsumerThread = NULL;
7575
}
7676
}
7777

@@ -105,9 +105,9 @@ bool PyProducerConsumer<DataT>::produce(const std::shared_ptr<DataT>& data)
105105
template<typename DataT>
106106
void PyProducerConsumer<DataT>::startConsumer()
107107
{
108-
if (!m_hThread)
108+
if (!m_hConsumerThread)
109109
{
110-
m_hThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)threadStart, this, 0, &m_dwThreadId);
110+
m_hConsumerThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)threadStart, this, 0, &m_dwThreadId);
111111
}
112112
}
113113

0 commit comments

Comments
 (0)