[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - include/vcl

[Luboš Luňák (via logerrit)]

 include/vcl/region.hxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 54d41a33fd5e363e35439235c1bcdaadc59b9a16
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Wed Sep 22 16:38:12 2021 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Wed Sep 29 12:41:42 2021 +0200

    put vcl::Region operator<< in the vcl namespace
    
    Clang says it belongs there when vcl::Region is used
    in CPPUNIT_ASSERT_EQUAL.
    
    Change-Id: I457d7b35e9b2ca37909118467da8018d40ab18a0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122461
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>
    (cherry picked from commit 05f5c12da968bd53337e832805894c048aad2c6c)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122745
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/include/vcl/region.hxx b/include/vcl/region.hxx
index 92dd9deb12df..48626ae01b9a 100644
--- a/include/vcl/region.hxx
+++ b/include/vcl/region.hxx
@@ -135,11 +135,9 @@ public:
     static vcl::Region GetRegionFromPolyPolygon( const tools::PolyPolygon& rPolyPoly );
 };
 
-} /* namespace vcl */
-
 template< typename charT, typename traits >
 inline std::basic_ostream<charT, traits> & operator <<(
-    std::basic_ostream<charT, traits> & stream, const vcl::Region& rRegion)
+    std::basic_ostream<charT, traits> & stream, const Region& rRegion)
 {
     if (rRegion.IsEmpty())
         return stream << "EMPTY";
@@ -163,6 +161,8 @@ inline std::basic_ostream<charT, traits> & operator <<(
     return stream;
 }
 
+} /* namespace vcl */
+
 #endif // INCLUDED_VCL_REGION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */