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
This commit is contained in:
Michael Stahl
@@ -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>
|
||||
|
||||
|
||||
@@ -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: */
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
#include "calendarImpl.hxx"
|
||||
#include "nativenumbersupplier.hxx"
|
||||
|
||||
#include "warnings_guard_unicode_calendar.h"
|
||||
#include <unicode/calendar.h>
|
||||
|
||||
// ----------------------------------------------------
|
||||
// class Calendar_gregorian
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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: */
|
||||
@@ -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: */
|
||||
@@ -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: */
|
||||
@@ -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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user