diff --git a/UsbDk/UsbDkUtil.cpp b/UsbDk/UsbDkUtil.cpp index 7e320d5..768cb3b 100644 --- a/UsbDk/UsbDkUtil.cpp +++ b/UsbDk/UsbDkUtil.cpp @@ -47,7 +47,7 @@ void CString::Destroy() } } -bool CStringComparator::operator== (const UNICODE_STRING& Str) +bool CStringBase::operator== (const UNICODE_STRING& Str) { if (m_String.Length != Str.Length) { diff --git a/UsbDk/UsbDkUtil.h b/UsbDk/UsbDkUtil.h index a6387f5..e3782d3 100644 --- a/UsbDk/UsbDkUtil.h +++ b/UsbDk/UsbDkUtil.h @@ -293,10 +293,10 @@ private: KEVENT m_Event; }; -class CStringComparator +class CStringBase { public: - bool operator== (const CStringComparator &Other) + bool operator== (const CStringBase &Other) { return *this == Other.m_String; } bool operator== (const UNICODE_STRING& Str); @@ -313,14 +313,14 @@ public: operator PCUNICODE_STRING() const { return &m_String; }; protected: - CStringComparator(const CStringComparator&) = delete; - CStringComparator& operator= (const CStringComparator&) = delete; - CStringComparator() {}; - ~CStringComparator() {}; + CStringBase(const CStringBase&) = delete; + CStringBase& operator= (const CStringBase&) = delete; + CStringBase() {}; + ~CStringBase() {}; UNICODE_STRING m_String; }; -class CStringHolder : public CStringComparator +class CStringHolder : public CStringBase { public: NTSTATUS Attach(NTSTRSAFE_PCWSTR String) @@ -336,7 +336,7 @@ private: CStringHolder& operator= (const CStringHolder&) = delete; }; -class CString : public CStringComparator +class CString : public CStringBase { public: NTSTATUS Create(NTSTRSAFE_PCWSTR String);