diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-04-07 07:23:39 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-04-07 07:23:39 +0000 |
| commit | d9da8f78a49fd6325d55ae2bac4a7d39c68e1cbd (patch) | |
| tree | 2e49f8adda020caf82aa6ee2d58d2081b4641dd6 /sc/inc/address.hxx | |
| parent | db22dae12bdb1518f07301c2e223d33a94b4ceea (diff) | |
INTEGRATION: CWS sixtyfour04 (1.8.110); FILE MERGED
2006/03/28 15:26:00 kendy 1.8.110.1: #i63489#
Templatize the Max()/Min()/Abs() definitions.
Diffstat (limited to 'sc/inc/address.hxx')
| -rw-r--r-- | sc/inc/address.hxx | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx index 936cefe542f8..4fbc5466164e 100644 --- a/sc/inc/address.hxx +++ b/sc/inc/address.hxx @@ -4,9 +4,9 @@ * * $RCSfile: address.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: rt $ $Date: 2005-10-21 11:48:10 $ + * last change: $Author: vg $ $Date: 2006-04-07 08:23:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -81,11 +81,6 @@ typedef sal_Int32 SCsCOLROW; // size_t typedef to be able to find places where code was changed from USHORT // to size_t and is used to read/write from/to streams. typedef size_t SCSIZE; -#ifndef MACOSX -// resolve ambiguity, TODO: move to tools/solar.h, or even better use ::std::min/max -inline size_t Min( size_t a, size_t b) { return a<b ? a : b; } -inline size_t Max( size_t a, size_t b) { return a>b ? a : b; } -#endif // Maximum possible value of data type, NOT maximum row value. // MSC confuses numeric_limit max() with macro max() if vcl/wintypes.hxx is |