diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-03-08 10:26:44 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-03-08 10:26:44 +0000 |
| commit | ab2ba47db94de80eaaabfbd47f123eb06e0a7628 (patch) | |
| tree | d150d216fec3f20f55bf898f169bbeed149854c7 /sc/inc/address.hxx | |
| parent | 91951303882dd7035982ea6369452f1606c130e2 (diff) | |
INTEGRATION: CWS calcer (1.4.116); FILE MERGED
2005/02/10 19:02:40 er 1.4.116.2: #i39928# MACOSX Min/Max ambiguity
2004/12/07 10:55:06 er 1.4.116.1: oops, ouch, aua, weia ...
Diffstat (limited to 'sc/inc/address.hxx')
| -rw-r--r-- | sc/inc/address.hxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx index 20caa149b3d4..7496864c1171 100644 --- a/sc/inc/address.hxx +++ b/sc/inc/address.hxx @@ -2,9 +2,9 @@ * * $RCSfile: address.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2004-08-23 09:22:05 $ + * last change: $Author: vg $ $Date: 2005-03-08 11:26:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -147,9 +147,11 @@ 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; } +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 |