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

[Libreoffice Gerrit user]

 include/sal/macros.h |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit 2301cb300acc1ad534a21ad93e8ed34ed71ba937
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Sun Nov 11 10:41:34 2018 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Sun Nov 11 18:11:19 2018 +0100

    [API CHANGE] Remove SAL_BOUND again
    
    ...that had been added to the stable URE interface, apparently by mistake, with
    7474699aa372296da7494d1d0bec1f7dafbaae79 "contains some slightly changed macros
    from vos/macros.hxx", then removed with 2f0803e5869dd2d45c8d4b407017f053e83ed601
    "remove unused macros, and add SAL_N_ELEMENTS", then re-introduced with
    d441fa1f8cc0a17a2bc166bf2f2a44f76b83a773 "remvove vos/macros.h usage".
    
    The last internal uses have now been removed with
    <https://gerrit.libreoffice.org/63264> "Replace uses of SAL_BOUND with
    o3tl::clamp".
    
    Change-Id: I0dd842533d97fa878606cbf62efb9fa46c029088
    Reviewed-on: https://gerrit.libreoffice.org/63265
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/include/sal/macros.h b/include/sal/macros.h
index 2e5a4b9d3df3..2337de92b0f8 100644
--- a/include/sal/macros.h
+++ b/include/sal/macros.h
@@ -48,10 +48,6 @@
 #    endif
 #endif
 
-#ifndef SAL_BOUND
-#    define SAL_BOUND(x,l,h)        ((x) <= (l) ? (l) : ((x) >= (h) ? (h) : (x)))
-#endif
-
 #ifndef SAL_STRINGIFY
 #   define SAL_STRINGIFY_ARG(x) #x
 #   define SAL_STRINGIFY(x) SAL_STRINGIFY_ARG(x)