Silence -Werror,-Wnon-virtual-dtor (clang-cl)

Change-Id: Icac0f029461c886ebb03aedcd54189116b66d8a3

14 files changed, 91 insertions, 0 deletions

diff --git a/include/cppuhelper/implbase1.hxx b/include/cppuhelper/implbase1.hxx
index 6a518263c92a..61022f296ee4 100644
--- a/include/cppuhelper/implbase1.hxx
+++ b/include/cppuhelper/implbase1.hxx
@@ -78,8 +78,14 @@ namespace cppu
 
 #if !defined _MSC_VER // public -> protected changes mangled names there
     protected:
+#elif defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
 #endif
         ~ImplHelper1() throw () {}
+#if defined _MSC_VER && defined __clang__
+#pragma clang diagnostic pop
+#endif
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
         css::uno::XInterface which supports weak mechanism to be held weakly
diff --git a/include/cppuhelper/implbase10.hxx b/include/cppuhelper/implbase10.hxx
index 30af2e931534..986e800d0fa0 100644
--- a/include/cppuhelper/implbase10.hxx
+++ b/include/cppuhelper/implbase10.hxx
@@ -88,8 +88,14 @@ namespace cppu
 
 #if !defined _MSC_VER // public -> protected changes mangled names there
     protected:
+#elif defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
 #endif
         ~ImplHelper10() throw () {}
+#if defined _MSC_VER && defined __clang__
+#pragma clang diagnostic pop
+#endif
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
         css::uno::XInterface which supports weak mechanism to be held weakly
diff --git a/include/cppuhelper/implbase11.hxx b/include/cppuhelper/implbase11.hxx
index 21ca4b1194e8..6375a3f49f40 100644
--- a/include/cppuhelper/implbase11.hxx
+++ b/include/cppuhelper/implbase11.hxx
@@ -89,8 +89,14 @@ namespace cppu
 
 #if !defined _MSC_VER // public -> protected changes mangled names there
     protected:
+#elif defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
 #endif
         ~ImplHelper11() throw () {}
+#if defined _MSC_VER && defined __clang__
+#pragma clang diagnostic pop
+#endif
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
         css::uno::XInterface which supports weak mechanism to be held weakly
diff --git a/include/cppuhelper/implbase12.hxx b/include/cppuhelper/implbase12.hxx
index 6ba5168bc5d4..b3d02e44160a 100644
--- a/include/cppuhelper/implbase12.hxx
+++ b/include/cppuhelper/implbase12.hxx
@@ -90,8 +90,14 @@ namespace cppu
 
 #if !defined _MSC_VER // public -> protected changes mangled names there
     protected:
+#elif defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
 #endif
         ~ImplHelper12() throw () {}
+#if defined _MSC_VER && defined __clang__
+#pragma clang diagnostic pop
+#endif
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
         css::uno::XInterface which supports weak mechanism to be held weakly
diff --git a/include/cppuhelper/implbase13.hxx b/include/cppuhelper/implbase13.hxx
index da99200746f9..aa0892946677 100644
--- a/include/cppuhelper/implbase13.hxx
+++ b/include/cppuhelper/implbase13.hxx
@@ -91,8 +91,14 @@ namespace cppu
 
 #if !defined _MSC_VER // public -> protected changes mangled names there
     protected:
+#elif defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
 #endif
         ~ImplHelper13() throw () {}
+#if defined _MSC_VER && defined __clang__
+#pragma clang diagnostic pop
+#endif
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
         css::uno::XInterface which supports weak mechanism to be held weakly
diff --git a/include/cppuhelper/implbase2.hxx b/include/cppuhelper/implbase2.hxx
index 6aa86e7ce2a7..f41746e857a0 100644
--- a/include/cppuhelper/implbase2.hxx
+++ b/include/cppuhelper/implbase2.hxx
@@ -79,8 +79,14 @@ namespace cppu
 
 #if !defined _MSC_VER // public -> protected changes mangled names there
     protected:
+#elif defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
 #endif
         ~ImplHelper2() throw () {}
+#if defined _MSC_VER && defined __clang__
+#pragma clang diagnostic pop
+#endif
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
         css::uno::XInterface which supports weak mechanism to be held weakly
diff --git a/include/cppuhelper/implbase3.hxx b/include/cppuhelper/implbase3.hxx
index 2e03cf4d2d60..691bfb38aefd 100644
--- a/include/cppuhelper/implbase3.hxx
+++ b/include/cppuhelper/implbase3.hxx
@@ -80,8 +80,14 @@ namespace cppu
 
 #if !defined _MSC_VER // public -> protected changes mangled names there
     protected:
+#elif defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
 #endif
         ~ImplHelper3() throw () {}
+#if defined _MSC_VER && defined __clang__
+#pragma clang diagnostic pop
+#endif
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
         css::uno::XInterface which supports weak mechanism to be held weakly
diff --git a/include/cppuhelper/implbase4.hxx b/include/cppuhelper/implbase4.hxx
index 0cd0881f5a66..645354398dfd 100644
--- a/include/cppuhelper/implbase4.hxx
+++ b/include/cppuhelper/implbase4.hxx
@@ -82,8 +82,14 @@ namespace cppu
 
 #if !defined _MSC_VER // public -> protected changes mangled names there
     protected:
+#elif defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
 #endif
         ~ImplHelper4() throw () {}
+#if defined _MSC_VER && defined __clang__
+#pragma clang diagnostic pop
+#endif
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
         css::uno::XInterface which supports weak mechanism to be held weakly
diff --git a/include/cppuhelper/implbase5.hxx b/include/cppuhelper/implbase5.hxx
index de58cc44464e..792593ace05e 100644
--- a/include/cppuhelper/implbase5.hxx
+++ b/include/cppuhelper/implbase5.hxx
@@ -83,8 +83,14 @@ namespace cppu
 
 #if !defined _MSC_VER // public -> protected changes mangled names there
     protected:
+#elif defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
 #endif
         ~ImplHelper5() throw () {}
+#if defined _MSC_VER && defined __clang__
+#pragma clang diagnostic pop
+#endif
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
         css::uno::XInterface which supports weak mechanism to be held weakly
diff --git a/include/cppuhelper/implbase6.hxx b/include/cppuhelper/implbase6.hxx
index 6bc857465a58..eef81231d0a4 100644
--- a/include/cppuhelper/implbase6.hxx
+++ b/include/cppuhelper/implbase6.hxx
@@ -84,8 +84,14 @@ namespace cppu
 
 #if !defined _MSC_VER // public -> protected changes mangled names there
     protected:
+#elif defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
 #endif
         ~ImplHelper6() throw () {}
+#if defined _MSC_VER && defined __clang__
+#pragma clang diagnostic pop
+#endif
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
         css::uno::XInterface which supports weak mechanism to be held weakly
diff --git a/include/cppuhelper/implbase7.hxx b/include/cppuhelper/implbase7.hxx
index e0b5f7bafb99..f83bc6612069 100644
--- a/include/cppuhelper/implbase7.hxx
+++ b/include/cppuhelper/implbase7.hxx
@@ -85,8 +85,14 @@ namespace cppu
 
 #if !defined _MSC_VER // public -> protected changes mangled names there
     protected:
+#elif defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
 #endif
         ~ImplHelper7() throw () {}
+#if defined _MSC_VER && defined __clang__
+#pragma clang diagnostic pop
+#endif
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
         css::uno::XInterface which supports weak mechanism to be held weakly
diff --git a/include/cppuhelper/implbase8.hxx b/include/cppuhelper/implbase8.hxx
index 6f14db5b4990..3ab86d884bc1 100644
--- a/include/cppuhelper/implbase8.hxx
+++ b/include/cppuhelper/implbase8.hxx
@@ -86,8 +86,14 @@ namespace cppu
 
 #if !defined _MSC_VER // public -> protected changes mangled names there
     protected:
+#elif defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
 #endif
         ~ImplHelper8() throw () {}
+#if defined _MSC_VER && defined __clang__
+#pragma clang diagnostic pop
+#endif
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
         css::uno::XInterface which supports weak mechanism to be held weakly
diff --git a/include/cppuhelper/implbase9.hxx b/include/cppuhelper/implbase9.hxx
index 507f2b71c9c2..e970f728914f 100644
--- a/include/cppuhelper/implbase9.hxx
+++ b/include/cppuhelper/implbase9.hxx
@@ -87,8 +87,14 @@ namespace cppu
 
 #if !defined _MSC_VER // public -> protected changes mangled names there
     protected:
+#elif defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
 #endif
         ~ImplHelper9() throw () {}
+#if defined _MSC_VER && defined __clang__
+#pragma clang diagnostic pop
+#endif
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
         css::uno::XInterface which supports weak mechanism to be held weakly
diff --git a/include/cppuhelper/propshlp.hxx b/include/cppuhelper/propshlp.hxx
index 77dbc27792b3..0130688471fd 100644
--- a/include/cppuhelper/propshlp.hxx
+++ b/include/cppuhelper/propshlp.hxx
@@ -335,9 +335,15 @@ public:
 
 #if !defined _MSC_VER // public -> protected changes mangled names there
 protected:
+#elif defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
 #endif
     ~IEventNotificationHook() {}
         // avoid warnings about virtual members and non-virtual dtor
+#if defined _MSC_VER && defined __clang__
+#pragma clang diagnostic pop
+#endif
 };
 
 
@@ -672,6 +678,10 @@ protected:
 #if defined _MSC_VER
 #pragma warning(push)
 #pragma warning(disable: 4265)
+#if defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
+#endif
 #endif
     /**
        You must call disposing before destruction.
@@ -679,6 +689,9 @@ protected:
     ~OPropertySetHelper();
 };
 #if defined _MSC_VER
+#if defined __clang__
+#pragma clang diagnostic pop
+#endif
 #pragma warning(pop)
 #endif