[Libreoffice-commits] core.git: sal/rtl

[Stephan Bergmann (via logerrit)]

 sal/rtl/strtmpl.hxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 91291170dd9688ad3f17e0aad03aa349be81db05
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Sun Jan 10 17:14:17 2021 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Sun Jan 10 20:12:22 2021 +0100

    Missing include guard in new sal/rtl/strtmpl.hxx
    
    ...as causing trouble in ASan/UBSan builds,
    
    > [CXX] jurt/source/pipe/staticsalhack.cxx
    > In file included from jurt/source/pipe/staticsalhack.cxx:20:
    > In file included from sal/rtl/ustring.cxx:51:
    > sal/rtl/strtmpl.hxx:38:28: error: redefinition of 'IMPL_RTL_USTRCODE'
    > template <typename C> auto IMPL_RTL_USTRCODE(C c) { return std::make_unsigned_t<C>(c); }
    >                            ^
    > sal/rtl/strtmpl.hxx:38:28: note: previous definition is here
    > template <typename C> auto IMPL_RTL_USTRCODE(C c) { return std::make_unsigned_t<C>(c); }
    >                            ^
    [...]
    
    Change-Id: Ied38a5f96bbb6d1c0d8ae956629ca6be64dc273f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109055
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sal/rtl/strtmpl.hxx b/sal/rtl/strtmpl.hxx
index 78d2e023e459..b63d9ff35415 100644
--- a/sal/rtl/strtmpl.hxx
+++ b/sal/rtl/strtmpl.hxx
@@ -22,6 +22,8 @@
 /* String-Class                                                            */
 /* ======================================================================= */
 
+#pragma once
+
 #include <algorithm>
 #include <cassert>
 #include <cstdlib>