diff options
Diffstat (limited to 'tubes/inc')
| -rw-r--r-- | tubes/inc/tubes/manager.hxx | 2 | ||||
| -rw-r--r-- | tubes/inc/tubes/warnings_guard_boost_signals2.hpp | 44 |
2 files changed, 45 insertions, 1 deletions
diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx index 326cc5191d22..ee743432f46c 100644 --- a/tubes/inc/tubes/manager.hxx +++ b/tubes/inc/tubes/manager.hxx @@ -40,7 +40,7 @@ #include <tools/link.hxx> #include <telepathy-glib/telepathy-glib.h> #include <vector> -#include <boost/signals2.hpp> +#include <tubes/warnings_guard_boost_signals2.hpp> // For testing purposes, we might need more in future. #define LIBO_TUBES_DBUS_INTERFACE "org.libreoffice.calc" diff --git a/tubes/inc/tubes/warnings_guard_boost_signals2.hpp b/tubes/inc/tubes/warnings_guard_boost_signals2.hpp new file mode 100644 index 000000000000..90a4c08214a5 --- /dev/null +++ b/tubes/inc/tubes/warnings_guard_boost_signals2.hpp @@ -0,0 +1,44 @@ +/* -*- 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_BOOST_SIGNALS2_HPP +#define INCLUDED_WARNINGS_GUARD_BOOST_SIGNALS2_HPP + +// 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. + +// boost 1.44 boost/signals2.hpp with gcc 4.6.3 causes +// solver/unxlngx6/inc/boost/signals2/detail/slot_template.hpp:122:7: error: +// declaration of ‘slot’ shadows a member of 'this' [-Werror=shadow] +// 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 <boost/signals2.hpp> +#ifdef _MSC_VER +#pragma warning(pop) +#endif + +#endif // INCLUDED_WARNINGS_GUARD_BOOST_SIGNALS2_HPP + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |