tubes/Package_inc.mk | 1 tubes/inc/tubes/manager.hxx | 2 - tubes/inc/tubes/warnings_guard_boost_signals2.hpp | 44 ++++++++++++++++++++++ 3 files changed, 46 insertions(+), 1 deletion(-)
New commits: commit ac7e27793b7633079ebac8c0e8177785c8bd26e7 Author: Eike Rathke <[email protected]> Date: Wed Jul 11 20:03:35 2012 +0200 tubes: warning guard for boost/signals2.hpp [-Werror=shadow] 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] Change-Id: I276e008aaebaca9c115bedc58d29c93c6dc526b8 diff --git a/tubes/Package_inc.mk b/tubes/Package_inc.mk index 3ac8876..2573c05 100644 --- a/tubes/Package_inc.mk +++ b/tubes/Package_inc.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/file-transfer-helper.h,tub $(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/manager.hxx,tubes/manager.hxx)) $(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/packet.hxx,tubes/packet.hxx)) $(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/tubesdllapi.h,tubes/tubesdllapi.h)) +$(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/warnings_guard_boost_signals2.hpp,tubes/warnings_guard_boost_signals2.hpp)) #$(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/,tubes/)) diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx index 326cc51..ee74343 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 0000000..90a4c08 --- /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: */
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
