[Libreoffice-commits] core.git: include/vbahelper vcl/inc

[Stephan Bergmann (via logerrit)]

 include/vbahelper/vbahelperinterface.hxx |    2 +-
 vcl/inc/vclstatuslistener.hxx            |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1dbb338842a9725cfbad73007f69244a13a0bea7
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Jun 17 17:29:09 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jun 17 19:51:04 2020 +0200

    Adapt to C++20 CWG2237
    
    ...<http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#2237> "Can a
    template-id name a constructor?", as implemented by GCC 11 trunk since
    <https://gcc.gnu.org/git/?p=gcc.git;a=commit;
    h=4b38d56dbac6742b038551a36ec80200313123a1> "c++: C++20 DR 2237, disallow
    simple-template-id in cdtor."
    
    Change-Id: I2113a3968549103e1b35fb17d7f12770ba0086d0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96547
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/include/vbahelper/vbahelperinterface.hxx b/include/vbahelper/vbahelperinterface.hxx
index 5feb4ab83eba..0bbf18992ec3 100644
--- a/include/vbahelper/vbahelperinterface.hxx
+++ b/include/vbahelper/vbahelperinterface.hxx
@@ -108,7 +108,7 @@ class SAL_DLLPUBLIC_TEMPLATE InheritedHelperInterfaceWeakImpl : public Inherited
 {
     typedef InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper< Ifc... > > Base;
 public:
-    InheritedHelperInterfaceWeakImpl< Ifc... >( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ) : Base( xParent, xContext ) {}
+    InheritedHelperInterfaceWeakImpl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ) : Base( xParent, xContext ) {}
 };
 
 
diff --git a/vcl/inc/vclstatuslistener.hxx b/vcl/inc/vclstatuslistener.hxx
index 2652befcd4cc..fb6d876ef6a2 100644
--- a/vcl/inc/vclstatuslistener.hxx
+++ b/vcl/inc/vclstatuslistener.hxx
@@ -24,7 +24,7 @@
 template <class T> class VclStatusListener final : public cppu::WeakImplHelper < css::frame::XStatusListener>
 {
 public:
-    VclStatusListener<T>(T* widget, const OUString& aCommand);
+    VclStatusListener(T* widget, const OUString& aCommand);
 
 private:
     VclPtr<T> mWidget; /** The widget on which actions are performed */