diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-21 15:32:10 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:39 -0500 |
| commit | d441fa1f8cc0a17a2bc166bf2f2a44f76b83a773 (patch) | |
| tree | ee86a4bfa54403bc82567950c1167f0e21fa8bf0 | |
| parent | a4c90068947f9a60e586ac38457238c33f33bef7 (diff) | |
remvove vos/macros.h usage
| -rw-r--r-- | io/test/stm/datatest.cxx | 1 | ||||
| -rw-r--r-- | sal/inc/sal/macros.h | 8 | ||||
| -rw-r--r-- | sal/inc/sal/types.h | 1 | ||||
| -rw-r--r-- | stoc/test/testintrosp.cxx | 1 |
4 files changed, 9 insertions, 2 deletions
diff --git a/io/test/stm/datatest.cxx b/io/test/stm/datatest.cxx index 13b9808c8acb..94e4cbdf48bc 100644 --- a/io/test/stm/datatest.cxx +++ b/io/test/stm/datatest.cxx @@ -58,7 +58,6 @@ using namespace ::rtl; using namespace ::osl; using namespace ::cppu; -//using namespace ::vos; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::io; using namespace ::com::sun::star::lang; diff --git a/sal/inc/sal/macros.h b/sal/inc/sal/macros.h index f88b1091856e..10824aef29c4 100644 --- a/sal/inc/sal/macros.h +++ b/sal/inc/sal/macros.h @@ -44,4 +44,12 @@ # define SAL_N_ELEMENTS(arr) (sizeof (arr) / sizeof ((arr)[0])) #endif +#ifndef SAL_BOUND +# define SAL_BOUND(x,l,h) ((x) <= (l) ? (l) : ((x) >= (h) ? (h) : (x))) +#endif + +#ifndef SAL_ABS +# define SAL_ABS(a) (((a) < 0) ? (-(a)) : (a)) +#endif + #endif diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h index 14c24480d98b..fdec36d87984 100644 --- a/sal/inc/sal/types.h +++ b/sal/inc/sal/types.h @@ -29,6 +29,7 @@ #define _SAL_TYPES_H_ #include <sal/config.h> +#include <sal/macros.h> /* Grab __SIZEOFxxx constants from typesconfig tool on Unix */ #if defined UNX diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx index c37671eb0c59..c27fae201b6f 100644 --- a/stoc/test/testintrosp.cxx +++ b/stoc/test/testintrosp.cxx @@ -56,7 +56,6 @@ using namespace rtl; using namespace cppu; -//using namespace vos; using namespace ModuleA; //using namespace ModuleB; //using namespace ModuleC; |