Various clang-cl/loplugin warnings

Change-Id: Ib18e04e5024d15f8bbbf4921932b07465fb1f32f

5 files changed, 23 insertions, 16 deletions

diff --git a/shell/inc/spsupp/COMOpenDocuments.hpp b/shell/inc/spsupp/COMOpenDocuments.hpp
index 1b2a52999ead..a0f733e16f6d 100644
--- a/shell/inc/spsupp/COMOpenDocuments.hpp
+++ b/shell/inc/spsupp/COMOpenDocuments.hpp
@@ -7,10 +7,17 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 
-#ifndef _COMOPENDOCUMENTS_HPP_
-#define _COMOPENDOCUMENTS_HPP_
+#ifndef INCLUDED_SHELL_INC_SPSUPP_COMOPENDOCUMENTS_HPP
+#define INCLUDED_SHELL_INC_SPSUPP_COMOPENDOCUMENTS_HPP
 
+#if defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
+#endif
 #include "spsupp_h.h"
+#if defined __clang__
+#pragma clang diagnostic pop
+#endif
 #include "COMRefCounted.hpp"
 #include "Objsafe.h"
 #include "assert.h"
@@ -28,7 +35,7 @@ public:
     };
 
     COMOpenDocuments();
-    virtual ~COMOpenDocuments();
+    virtual ~COMOpenDocuments() override;
 
     // IUnknown methods
 
@@ -210,6 +217,6 @@ private:
     COMObjectSafety m_aObjectSafety;
 };
 
-#endif // _COMOPENDOCUMENTS_HPP_
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/inc/spsupp/COMRefCounted.hpp b/shell/inc/spsupp/COMRefCounted.hpp
index 075923d84266..230f6c8da517 100644
--- a/shell/inc/spsupp/COMRefCounted.hpp
+++ b/shell/inc/spsupp/COMRefCounted.hpp
@@ -7,8 +7,8 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 
-#ifndef _COMREFCOUNTED_HPP_
-#define _COMREFCOUNTED_HPP_
+#ifndef INCLUDED_SHELL_INC_SPSUPP_COMREFCOUNTED_HPP
+#define INCLUDED_SHELL_INC_SPSUPP_COMREFCOUNTED_HPP
 
 #include "objbase.h"
 
@@ -37,6 +37,6 @@ private:
     long m_nRef = 1; // Created referenced
 };
 
-#endif // _COMREFCOUNTED_HPP_
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/inc/spsupp/registrar.hpp b/shell/inc/spsupp/registrar.hpp
index 00b230e5c624..ed41c4d04003 100644
--- a/shell/inc/spsupp/registrar.hpp
+++ b/shell/inc/spsupp/registrar.hpp
@@ -7,8 +7,8 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 
-#ifndef _REGISTRAR_H
-#define _REGISTRAR_H
+#ifndef INCLUDED_SHELL_INC_SPSUPP_REGISTRAR_H
+#define INCLUDED_SHELL_INC_SPSUPP_REGISTRAR_H
 
 #include "windows.h"
 
diff --git a/shell/inc/spsupp/spsuppClassFactory.hpp b/shell/inc/spsupp/spsuppClassFactory.hpp
index 9d9379154222..9deccbd97edc 100644
--- a/shell/inc/spsupp/spsuppClassFactory.hpp
+++ b/shell/inc/spsupp/spsuppClassFactory.hpp
@@ -7,8 +7,8 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 
-#ifndef _SPSUPPCLASSFACTORY_H_
-#define _SPSUPPCLASSFACTORY_H_
+#ifndef INCLUDED_SHELL_INC_SPSUPP_SPSUPPCLASSFACTORY_HPP
+#define INCLUDED_SHELL_INC_SPSUPP_SPSUPPCLASSFACTORY_HPP
 
 #include "COMRefCounted.hpp"
 
@@ -16,7 +16,7 @@ class ClassFactory : public COMRefCounted<IClassFactory>
 {
 public:
     ClassFactory();
-    virtual ~ClassFactory();
+    virtual ~ClassFactory() override;
 
     // IUnknown methods
 
@@ -44,6 +44,6 @@ private:
     static long m_nLockCount;
 };
 
-#endif // _SPSUPPCLASSFACTORY_H_
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/inc/spsupp/spsuppServ.hpp b/shell/inc/spsupp/spsuppServ.hpp
index 971e6bcda9b8..e3c78dc3fa6b 100644
--- a/shell/inc/spsupp/spsuppServ.hpp
+++ b/shell/inc/spsupp/spsuppServ.hpp
@@ -7,14 +7,14 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 
-#ifndef _SPSUPPSERV_HPP_
-#define _SPSUPPSERV_HPP_
+#ifndef INCLUDED_SHELL_INC_SPSUPP_SPSUPPSERV_HPP
+#define INCLUDED_SHELL_INC_SPSUPP_SPSUPPSERV_HPP
 
 #include <objbase.h>
 
 ITypeLib* GetTypeLib();
 const wchar_t* GetLOPath();
 
-#endif // _SPSUPPSERV_HPP_
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */