[Libreoffice-commits] core.git: canvas/source

[Michael Weghorn (via logerrit)]

 canvas/source/vcl/outdevholder.hxx |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 46c71f04c9e1fa9d257c26dd8a8f5e99bbbb1575
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Tue May 18 12:55:57 2021 +0200
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Tue May 18 14:39:18 2021 +0200

    Drop assert checking address of reference is not nullptr
    
    It was introduced in
    
        commit 9090dc1f3b27195f5defd35586ac79357992be21
        Date:   Mon Jan 18 18:27:19 2021 +0200
    
            split OutputDevice from Window
    
    and caused my GCC 10 '--enable-werror' build to fail with
    
        In file included from /usr/include/c++/10/cassert:44,
                         from .../include/tools/ref.hxx:23,
                         from .../include/vcl/outdev.hxx:24,
                         from .../canvas/source/vcl/impltools.hxx:25,
                         from .../canvas/source/vcl/canvas.hxx:39,
                         from .../canvas/source/vcl/canvas.cxx:22:
        .../canvas/source/vcl/outdevholder.hxx: In constructor ‘vclcanvas::OutDevHolder::OutDevHolder(OutputDevice&)’:
        .../canvas/source/vcl/outdevholder.hxx:38:16: error: the compiler can assume that the address of ‘rOutDev’ will never be NULL [-Werror=address]
           38 |         assert(&rOutDev);
              |                ^~~~~~~~
        cc1plus: all warnings being treated as errors
        make[1]: *** [.../solenv/gbuild/LinkTarget.mk:301: /home/michi/development/git/libreoffice/workdir/CxxObject/canvas/source/vcl/canvas.o] Error 1
        make[1]: *** Waiting for unfinished jobs....
        In file included from .../include/comphelper/solarmutex.hxx:25,
                         from .../include/vcl/svapp.hxx:29,
                         from .../canvas/source/vcl/impltools.hxx:24,
                         from .../canvas/source/vcl/spritecanvas.hxx:44,
                         from .../canvas/source/vcl/spritecanvas.cxx:28:
        .../canvas/source/vcl/outdevholder.hxx: In constructor ‘vclcanvas::OutDevHolder::OutDevHolder(OutputDevice&)’:
        .../canvas/source/vcl/outdevholder.hxx:38:16: error: the compiler can assume that the address of ‘rOutDev’ will never be NULL [-Werror=address]
           38 |         assert(&rOutDev);
    
    Change-Id: I9e8ef7e91dba847f4894124348f13755fc620fac
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115737
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/canvas/source/vcl/outdevholder.hxx b/canvas/source/vcl/outdevholder.hxx
index 28dfd4317fe0..78f3badf8bb6 100644
--- a/canvas/source/vcl/outdevholder.hxx
+++ b/canvas/source/vcl/outdevholder.hxx
@@ -35,7 +35,6 @@ public:
     explicit OutDevHolder(OutputDevice& rOutDev)
         : mrOutDev(rOutDev)
     {
-        assert(&rOutDev);
     }
 
 private: