[Libreoffice-commits] core.git: 3 commits - forms/source i18npool/inc i18npool/source include/tools sdext/source ucb/source
Michael Stahl
mstahl at redhat.com
Wed Nov 13 15:09:23 PST 2013
forms/source/xforms/datatypes.hxx | 3 -
forms/source/xforms/warnings_guard_unicode_regex.h | 42 ------------------
i18npool/inc/breakiterator_unicode.hxx | 2
i18npool/inc/calendar_gregorian.hxx | 2
i18npool/inc/collator_unicode.hxx | 2
i18npool/inc/warnings_guard_unicode_brkiter.h | 42 ------------------
i18npool/inc/warnings_guard_unicode_calendar.h | 42 ------------------
i18npool/inc/warnings_guard_unicode_tblcoll.h | 42 ------------------
i18npool/source/collator/gencoll_rule.cxx | 2
include/tools/inetmime.hxx | 5 --
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 11 +++-
ucb/source/ucp/webdav-neon/NeonLockStore.cxx | 2
ucb/source/ucp/webdav-neon/NeonLockStore.hxx | 4 +
ucb/source/ucp/webdav-neon/NeonTypes.hxx | 2
ucb/source/ucp/webdav-neon/warnings_guard_ne_locks.h | 35 ---------------
15 files changed, 20 insertions(+), 218 deletions(-)
New commits:
commit acf93bbc9721038d37743c0c51170e71c6dcda28
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Nov 13 23:37:48 2013 +0100
remove more pragma instances of GCC system_header
Use "#pragma GCC diagnostic ignored" instead which does not prevent
generation of dependencies.
Change-Id: Ic9034f20ef71c1ee6e5363b73c831142c2813d20
diff --git a/include/tools/inetmime.hxx b/include/tools/inetmime.hxx
index 6370cc4..fbbe88c 100644
--- a/include/tools/inetmime.hxx
+++ b/include/tools/inetmime.hxx
@@ -410,11 +410,6 @@ public:
static OUString decodeHeaderFieldBody(HeaderFieldType eType,
const OString& rBody);
-// #i70651#: Prevent warnings on Mac OS X.
-#ifdef MACOSX
-#pragma GCC system_header
-#endif
-
/** Get the UTF-32 character at the head of a UTF-16 encoded string.
@param rBegin Points to the start of the UTF-16 encoded string, must
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index e990ca1..9e34d4b 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -23,7 +23,10 @@
#include <sal/types.h>
#if defined __GNUC__
-#pragma GCC system_header
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wunused-parameter"
+#endif
#elif defined __SUNPRO_CC
#pragma disable_warn
#elif defined _MSC_VER
@@ -39,7 +42,11 @@
#include "GlobalParams.h"
#include "PDFDoc.h"
-#if defined __SUNPRO_CC
+#if defined __GNUC__
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+# pragma GCC diagnostic pop
+#endif
+#elif defined __SUNPRO_CC
#pragma enable_warn
#elif defined _MSC_VER
#pragma warning(pop)
commit 83dcbe4ca755e53aaab6fb95647d95998182a51f
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Nov 13 23:24:01 2013 +0100
ucb: kill webdav-neon/warnings_guard_ne_locks.h too
Change-Id: I44919cf592eee026116fc5fbc12e0d5baa4bda2b
diff --git a/ucb/source/ucp/webdav-neon/NeonLockStore.cxx b/ucb/source/ucp/webdav-neon/NeonLockStore.cxx
index 890402c..17e43bb 100644
--- a/ucb/source/ucp/webdav-neon/NeonLockStore.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonLockStore.cxx
@@ -27,7 +27,7 @@
************************************************************************/
-#include "warnings_guard_ne_locks.h"
+#include <ne_locks.h>
#include <ne_uri.h>
#include "rtl/ustring.hxx"
#include "osl/time.h"
diff --git a/ucb/source/ucp/webdav-neon/NeonLockStore.hxx b/ucb/source/ucp/webdav-neon/NeonLockStore.hxx
index 529158e..8d3b22f 100644
--- a/ucb/source/ucp/webdav-neon/NeonLockStore.hxx
+++ b/ucb/source/ucp/webdav-neon/NeonLockStore.hxx
@@ -30,7 +30,9 @@
#include <config_lgpl.h>
#include <map>
-#include "warnings_guard_ne_locks.h"
+
+#include <ne_locks.h>
+
#include "osl/mutex.hxx"
#include "rtl/ref.hxx"
#include "NeonTypes.hxx"
diff --git a/ucb/source/ucp/webdav-neon/NeonTypes.hxx b/ucb/source/ucp/webdav-neon/NeonTypes.hxx
index 926529f..cc40eb2 100644
--- a/ucb/source/ucp/webdav-neon/NeonTypes.hxx
+++ b/ucb/source/ucp/webdav-neon/NeonTypes.hxx
@@ -34,7 +34,7 @@
#include <ne_utils.h>
#include <ne_basic.h>
#include <ne_props.h>
-#include "warnings_guard_ne_locks.h"
+#include <ne_locks.h>
typedef ne_session HttpSession;
typedef ne_status HttpStatus;
diff --git a/ucb/source/ucp/webdav-neon/warnings_guard_ne_locks.h b/ucb/source/ucp/webdav-neon/warnings_guard_ne_locks.h
deleted file mode 100644
index 0cccdf4..0000000
--- a/ucb/source/ucp/webdav-neon/warnings_guard_ne_locks.h
+++ /dev/null
@@ -1,35 +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/.
- */
-
-#ifndef INCLUDED_WARNINGS_GUARD_NE_LOCKS_H
-#define INCLUDED_WARNINGS_GUARD_NE_LOCKS_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.
-
-/*
- Silence down this WaE:
- /usr/include/neon/ne_locks.h:125:51: warning: 'int ne_lock(ne_session*, ne_lock*)'
- hides constructor for 'struct ne_lock' [-Wshadow]
-*/
-
-#ifdef _MSC_VER
-#pragma warning(push, 1)
-#elif defined __GNUC__
-#pragma GCC system_header
-#endif
-#include <ne_locks.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-#endif // INCLUDED_WARNINGS_GUARD_NE_LOCKS_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit d6809a9ac55d80a9bae07d0c7d00137e211c49e8
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Nov 13 23:17:17 2013 +0100
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
diff --git a/forms/source/xforms/datatypes.hxx b/forms/source/xforms/datatypes.hxx
index 5c30b37..eec9627 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 5bb83b9..0000000
--- 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 2b45fb0..a1c9ff9 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 6a45d56..f9b788d 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 daf9906..b7a0a74 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 5e07754..0000000
--- 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 6ece4a5..0000000
--- 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 ad6d1f0..0000000
--- 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 afca09f..a801545 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);
More information about the Libreoffice-commits
mailing list