diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:44:43 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:44:43 +0000 |
| commit | 84a5e451bdf2c38784dcde8342ab596f5cc95590 (patch) | |
| tree | d3aa820df08b497764bbddefcde19f1333ea6930 | |
| parent | 11c2e0186eb3a898ecda8105b5c32e82b74c8e91 (diff) | |
INTEGRATION: CWS warnings01 (1.6.2); FILE MERGED
2006/04/07 21:05:13 sb 1.6.2.3: RESYNC: (1.6-1.7); FILE MERGED
2006/03/08 13:19:09 nn 1.6.2.2: #i53898# warning-free code
2005/11/10 10:15:00 pl 1.6.2.1: #i53898# removed warnings
| -rw-r--r-- | i18npool/source/collator/gencoll_rule.cxx | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/i18npool/source/collator/gencoll_rule.cxx b/i18npool/source/collator/gencoll_rule.cxx index 442939425c76..b4b05860d714 100644 --- a/i18npool/source/collator/gencoll_rule.cxx +++ b/i18npool/source/collator/gencoll_rule.cxx @@ -4,9 +4,9 @@ * * $RCSfile: gencoll_rule.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: kz $ $Date: 2006-01-31 18:36:13 $ + * last change: $Author: hr $ $Date: 2006-06-20 04:44:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -39,7 +39,17 @@ #include <sal/main.h> #include <sal/types.h> #include <rtl/ustrbuf.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/tblcoll.h> +#ifdef _MSC_VER +#pragma warning(pop) +#endif using namespace ::rtl; @@ -140,6 +150,5 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) if (coll) delete coll; - exit(U_SUCCESS(status) ? 0 : 1); - return 0; + return U_SUCCESS(status) ? 0 : 1; } // End of main |