diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-09-05 11:04:42 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-09-06 09:17:26 +0200 |
| commit | 796c494d78a851aae7d58e0720f64984cb5716de (patch) | |
| tree | b867736e46945b3cb5b5e4f963090939a8535172 /sal | |
| parent | 176a723876b0138debb20f824103b2ab0c910401 (diff) | |
Clean up sal/backtrace.hxx
Change-Id: Id78e9c0ca29ff2e52591f3d446431ac23c20ab7a
Reviewed-on: https://gerrit.libreoffice.org/41926
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/unx/backtraceapi.cxx | 4 | ||||
| -rw-r--r-- | sal/osl/w32/backtrace.cxx | 4 | ||||
| -rw-r--r-- | sal/util/sal.map | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sal/osl/unx/backtraceapi.cxx b/sal/osl/unx/backtraceapi.cxx index 4838474be36c..4216bf2cd07d 100644 --- a/sal/osl/unx/backtraceapi.cxx +++ b/sal/osl/unx/backtraceapi.cxx @@ -59,7 +59,7 @@ OUString osl::detail::backtraceAsString(sal_uInt32 maxDepth) { return b3.makeStringAndClear(); } -std::unique_ptr<BacktraceState> sal_backtrace_get(sal_uInt32 maxDepth) +std::unique_ptr<sal::BacktraceState> sal::backtrace_get(sal_uInt32 maxDepth) { assert(maxDepth != 0); auto const maxInt = static_cast<unsigned int>( @@ -72,7 +72,7 @@ std::unique_ptr<BacktraceState> sal_backtrace_get(sal_uInt32 maxDepth) return std::unique_ptr<BacktraceState>(new BacktraceState{ b1, n }); } -OUString sal_backtrace_to_string(BacktraceState* backtraceState) +OUString sal::backtrace_to_string(BacktraceState* backtraceState) { FreeGuard b2(backtrace_symbols(backtraceState->buffer, backtraceState->nDepth)); if (b2.buffer == nullptr) { diff --git a/sal/osl/w32/backtrace.cxx b/sal/osl/w32/backtrace.cxx index 230adca4a2f8..574e4a450f48 100644 --- a/sal/osl/w32/backtrace.cxx +++ b/sal/osl/w32/backtrace.cxx @@ -65,7 +65,7 @@ OUString osl::detail::backtraceAsString(sal_uInt32 maxDepth) return aBuf.makeStringAndClear(); } -std::unique_ptr<BacktraceState> sal_backtrace_get(sal_uInt32 maxDepth) +std::unique_ptr<sal::BacktraceState> sal::backtrace_get(sal_uInt32 maxDepth) { assert(maxDepth != 0); auto const maxUlong = std::numeric_limits<ULONG>::max(); @@ -87,7 +87,7 @@ std::unique_ptr<BacktraceState> sal_backtrace_get(sal_uInt32 maxDepth) return std::unique_ptr<BacktraceState>(new BacktraceState{ pStack, nFrames }); } -OUString sal_backtrace_to_string(BacktraceState* backtraceState) +OUString sal::backtrace_to_string(BacktraceState* backtraceState) { OUStringBuffer aBuf; diff --git a/sal/util/sal.map b/sal/util/sal.map index e9195a1434f8..4bfe548d22f0 100644 --- a/sal/util/sal.map +++ b/sal/util/sal.map @@ -735,8 +735,8 @@ PRIVATE_1.3 { # LibreOffice 5.4 PRIVATE_1.4 { # LibreOffice 6.0 global: - _Z17sal_backtrace_getj; - _Z23sal_backtrace_to_stringP14BacktraceState; + _ZN3sal13backtrace_getEj; + _ZN3sal19backtrace_to_stringEPNS_14BacktraceStateE; } PRIVATE_1.3; PRIVATE_textenc.1 { # LibreOffice 3.6 |