diff options
author | Michael Stahl <mstahl@redhat.com> | 2013-11-13 23:17:17 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-11-14 00:04:16 +0100 |
commit | d6809a9ac55d80a9bae07d0c7d00137e211c49e8 (patch) | |
tree | 004d6a47489b0e9132e0eed07f3f1486f8d9fd1c | |
parent | Let's not comment out the whole unit test target. (diff) | |
download | core-d6809a9ac55d80a9bae07d0c7d00137e211c49e8.tar.gz core-d6809a9ac55d80a9bae07d0c7d00137e211c49e8.zip |
i18npool, forms: remove warnings_guard_unicode*.h
These horrible headers use "#pragma GCC system_header" and thereby
prevent generated Makefile dependencies, which is what broke incremental
builds after the ICU upgrade today.
Change-Id: Ife983b3c4de86968da8a0187a1acb1bbb2b5c81f
-rw-r--r-- | forms/source/xforms/datatypes.hxx | 3 | ||||
-rw-r--r-- | forms/source/xforms/warnings_guard_unicode_regex.h | 42 | ||||
-rw-r--r-- | i18npool/inc/breakiterator_unicode.hxx | 2 | ||||
-rw-r--r-- | i18npool/inc/calendar_gregorian.hxx | 2 | ||||
-rw-r--r-- | i18npool/inc/collator_unicode.hxx | 2 | ||||
-rw-r--r-- | i18npool/inc/warnings_guard_unicode_brkiter.h | 42 | ||||
-rw-r--r-- | i18npool/inc/warnings_guard_unicode_calendar.h | 42 | ||||
-rw-r--r-- | i18npool/inc/warnings_guard_unicode_tblcoll.h | 42 | ||||
-rw-r--r-- | i18npool/source/collator/gencoll_rule.cxx | 2 |
9 files changed, 6 insertions, 173 deletions
diff --git a/forms/source/xforms/datatypes.hxx b/forms/source/xforms/datatypes.hxx index 5c30b3777bb3..eec962725d78 100644 --- a/forms/source/xforms/datatypes.hxx +++ b/forms/source/xforms/datatypes.hxx @@ -31,7 +31,8 @@ #include <comphelper/propertycontainer.hxx> #include <comphelper/proparrhlp.hxx> #include <comphelper/broadcasthelper.hxx> -#include "warnings_guard_unicode_regex.h" + +#include <unicode/regex.h> #include <memory> diff --git a/forms/source/xforms/warnings_guard_unicode_regex.h b/forms/source/xforms/warnings_guard_unicode_regex.h deleted file mode 100644 index 5bb83b987ff2..000000000000 --- a/forms/source/xforms/warnings_guard_unicode_regex.h +++ /dev/null @@ -1,42 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_FORMS_SOURCE_XFORMS_WARNINGS_GUARD_UNICODE_REGEX_H -#define INCLUDED_FORMS_SOURCE_XFORMS_WARNINGS_GUARD_UNICODE_REGEX_H - -// Because the GCC system_header mechanism doesn't work in .c/.cxx compilation -// units and more important affects the rest of the current include file, the -// warnings guard is separated into this header file on its own. - -// 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) -#elif defined __GNUC__ -#pragma GCC system_header -#endif -#include <unicode/regex.h> -#ifdef _MSC_VER -#pragma warning(pop) -#endif - -#endif // INCLUDED_FORMS_SOURCE_XFORMS_WARNINGS_GUARD_UNICODE_REGEX_H - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/i18npool/inc/breakiterator_unicode.hxx b/i18npool/inc/breakiterator_unicode.hxx index 2b45fb091f02..a1c9ff9ef0ee 100644 --- a/i18npool/inc/breakiterator_unicode.hxx +++ b/i18npool/inc/breakiterator_unicode.hxx @@ -21,7 +21,7 @@ #include <breakiteratorImpl.hxx> -#include "warnings_guard_unicode_brkiter.h" +#include <unicode/brkiter.h> namespace com { namespace sun { namespace star { namespace i18n { diff --git a/i18npool/inc/calendar_gregorian.hxx b/i18npool/inc/calendar_gregorian.hxx index 6a45d56e30ca..f9b788d8d530 100644 --- a/i18npool/inc/calendar_gregorian.hxx +++ b/i18npool/inc/calendar_gregorian.hxx @@ -22,7 +22,7 @@ #include "calendarImpl.hxx" #include "nativenumbersupplier.hxx" -#include "warnings_guard_unicode_calendar.h" +#include <unicode/calendar.h> // ---------------------------------------------------- // class Calendar_gregorian diff --git a/i18npool/inc/collator_unicode.hxx b/i18npool/inc/collator_unicode.hxx index daf99068e156..b7a0a74ce0f8 100644 --- a/i18npool/inc/collator_unicode.hxx +++ b/i18npool/inc/collator_unicode.hxx @@ -24,7 +24,7 @@ #include <cppuhelper/implbase1.hxx> #include <osl/module.h> -#include "warnings_guard_unicode_tblcoll.h" +#include <unicode/tblcoll.h> // ---------------------------------------------------- // class Collator_Unicode diff --git a/i18npool/inc/warnings_guard_unicode_brkiter.h b/i18npool/inc/warnings_guard_unicode_brkiter.h deleted file mode 100644 index 5e0775435636..000000000000 --- a/i18npool/inc/warnings_guard_unicode_brkiter.h +++ /dev/null @@ -1,42 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_WARNINGS_GUARD_UNICODE_BRKITER_H -#define INCLUDED_WARNINGS_GUARD_UNICODE_BRKITER_H - -// Because the GCC system_header mechanism doesn't work in .c/.cxx compilation -// units and more important affects the rest of the current include file, the -// warnings guard is separated into this header file on its own. - -// 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) -#elif defined __GNUC__ -#pragma GCC system_header -#endif -#include <unicode/brkiter.h> -#ifdef _MSC_VER -#pragma warning(pop) -#endif - -#endif // INCLUDED_WARNINGS_GUARD_UNICODE_BRKITER_H - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/i18npool/inc/warnings_guard_unicode_calendar.h b/i18npool/inc/warnings_guard_unicode_calendar.h deleted file mode 100644 index 6ece4a55dc2d..000000000000 --- a/i18npool/inc/warnings_guard_unicode_calendar.h +++ /dev/null @@ -1,42 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_WARNINGS_GUARD_UNICODE_CALENDAR_H -#define INCLUDED_WARNINGS_GUARD_UNICODE_CALENDAR_H - -// Because the GCC system_header mechanism doesn't work in .c/.cxx compilation -// units and more important affects the rest of the current include file, the -// warnings guard is separated into this header file on its own. - -// 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) -#elif defined __GNUC__ -#pragma GCC system_header -#endif -#include <unicode/calendar.h> -#ifdef _MSC_VER -#pragma warning(pop) -#endif - -#endif // INCLUDED_WARNINGS_GUARD_UNICODE_CALENDAR_H - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/i18npool/inc/warnings_guard_unicode_tblcoll.h b/i18npool/inc/warnings_guard_unicode_tblcoll.h deleted file mode 100644 index ad6d1f036601..000000000000 --- a/i18npool/inc/warnings_guard_unicode_tblcoll.h +++ /dev/null @@ -1,42 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_WARNINGS_GUARD_UNICODE_TBLCOLL_H -#define INCLUDED_WARNINGS_GUARD_UNICODE_TBLCOLL_H - -// Because the GCC system_header mechanism doesn't work in .c/.cxx compilation -// units and more important affects the rest of the current include file, the -// warnings guard is separated into this header file on its own. - -// 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) -#elif defined __GNUC__ -#pragma GCC system_header -#endif -#include <unicode/tblcoll.h> -#ifdef _MSC_VER -#pragma warning(pop) -#endif - -#endif // INCLUDED_WARNINGS_GUARD_UNICODE_TBLCOLL_H - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/i18npool/source/collator/gencoll_rule.cxx b/i18npool/source/collator/gencoll_rule.cxx index afca09f00d36..a80154556d73 100644 --- a/i18npool/source/collator/gencoll_rule.cxx +++ b/i18npool/source/collator/gencoll_rule.cxx @@ -26,7 +26,7 @@ #include <sal/types.h> #include <rtl/ustrbuf.hxx> -#include "warnings_guard_unicode_tblcoll.h" +#include <unicode/tblcoll.h> U_CAPI void U_EXPORT2 uprv_free(void *mem); |