Commit 5455e38e authored by Roman Donchenko's avatar Roman Donchenko Committed by Dikay900

cap_msmf.hpp: fix a warning about nNull being unused

The two functions featuring nNull are not particularly needed, so
I simply removed them.

Conflicts:
	modules/highgui/src/cap_msmf.hpp
parent b99f7a29
...@@ -603,11 +603,6 @@ public: ...@@ -603,11 +603,6 @@ public:
ComPtr() throw() ComPtr() throw()
{ {
} }
ComPtr(int nNull) throw()
{
assert(nNull == 0);
p = NULL;
}
ComPtr(T* lp) throw() ComPtr(T* lp) throw()
{ {
p = lp; p = lp;
...@@ -638,13 +633,6 @@ public: ...@@ -638,13 +633,6 @@ public:
{ {
return p.operator==(pT); return p.operator==(pT);
} }
// For comparison to NULL
bool operator==(int nNull) const
{
assert(nNull == 0);
return p.operator==(NULL);
}
bool operator!=(_In_opt_ T* pT) const throw() bool operator!=(_In_opt_ T* pT) const throw()
{ {
return p.operator!=(pT); return p.operator!=(pT);
...@@ -3123,7 +3111,7 @@ public: ...@@ -3123,7 +3111,7 @@ public:
HRESULT hr = CheckShutdown(); HRESULT hr = CheckShutdown();
if (SUCCEEDED(hr)) { if (SUCCEEDED(hr)) {
if (m_spClock == NULL) { if (!m_spClock) {
hr = MF_E_NO_CLOCK; // There is no presentation clock. hr = MF_E_NO_CLOCK; // There is no presentation clock.
} else { } else {
// Return the pointer to the caller. // Return the pointer to the caller.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment