diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:40:26 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:40:26 +0000 |
| commit | 87e64dee9f576bede41acf19b61c1c1b22217da2 (patch) | |
| tree | fe9e58abfb5e0422d31f6528ea56b7ed7c7a376a /i18npool/inc/calendar_gregorian.hxx | |
| parent | 6a4458760483eb40fe4db4a32e7c6e078c7f46c6 (diff) | |
INTEGRATION: CWS warnings01 (1.10.14); FILE MERGED
2006/03/08 13:19:07 nn 1.10.14.1: #i53898# warning-free code
Diffstat (limited to 'i18npool/inc/calendar_gregorian.hxx')
| -rw-r--r-- | i18npool/inc/calendar_gregorian.hxx | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/i18npool/inc/calendar_gregorian.hxx b/i18npool/inc/calendar_gregorian.hxx index f7f8c75f1545..819c7730ff5c 100644 --- a/i18npool/inc/calendar_gregorian.hxx +++ b/i18npool/inc/calendar_gregorian.hxx @@ -4,9 +4,9 @@ * * $RCSfile: calendar_gregorian.hxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: rt $ $Date: 2005-09-07 16:48:54 $ + * last change: $Author: hr $ $Date: 2006-06-20 04:40:26 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -37,7 +37,17 @@ #include "calendarImpl.hxx" #include "nativenumbersupplier.hxx" + +// External unicode includes (from icu) cause warning C4668 on Windows. +// We want to minimize the patches to external headers, so the warnings are +// disabled here instead of in the header file itself. +#ifdef _MSC_VER +#pragma warning(push, 1) +#endif #include "unicode/calendar.h" +#ifdef _MSC_VER +#pragma warning(pop) +#endif // ---------------------------------------------------- // class Calendar_gregorian |