avmedia/Library_avmedia.mk | 1 avmedia/source/framework/collada_headers.hxx | 29 +++++++++++++++++++++++++++ avmedia/source/framework/modeltools.cxx | 2 - include/avmedia/mediaplayer.hxx | 1 4 files changed, 30 insertions(+), 3 deletions(-)
New commits: commit 42d5cd314a351e325b6099dd523bbef2e4e4317a Author: Stephan Bergmann <[email protected]> Date: Fri Oct 17 11:16:40 2014 +0200 More fine grained disabling of -Werror for collada headers only Change-Id: I4f80d480e6e053038b85f6b26f74abc5921c2f38 diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk index 7cc08fa..6bfc791 100644 --- a/avmedia/Library_avmedia.mk +++ b/avmedia/Library_avmedia.mk @@ -53,7 +53,6 @@ $(eval $(call gb_Library_add_exception_objects,avmedia,\ endif ifeq ($(ENABLE_COLLADA),TRUE) -$(eval $(call gb_Library_set_warnings_not_errors,avmedia)) ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_libs,avmedia,\ diff --git a/avmedia/source/framework/collada_headers.hxx b/avmedia/source/framework/collada_headers.hxx new file mode 100644 index 0000000..e32e069 --- /dev/null +++ b/avmedia/source/framework/collada_headers.hxx @@ -0,0 +1,29 @@ +/* -*- 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_AVMEDIA_SOURCE_FRAMEWORK_COLLADA_HEADERS_HXX +#define INCLUDED_AVMEDIA_SOURCE_FRAMEWORK_COLLADA_HEADERS_HXX + +#include <sal/config.h> + +#if defined __GNUC__ +#pragma GCC system_header +#elif defined _MSC_VER +#pragma warning(push, 1) +#endif + +#include <COLLADA2GLTFWriter.h> + +#if defined _MSC_VER +#pragma warning(pop) +#endif + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/framework/modeltools.cxx b/avmedia/source/framework/modeltools.cxx index 4360f42..003c84c 100644 --- a/avmedia/source/framework/modeltools.cxx +++ b/avmedia/source/framework/modeltools.cxx @@ -32,7 +32,7 @@ #include <config_features.h> #if HAVE_FEATURE_COLLADA -#include <COLLADA2GLTFWriter.h> +#include <collada_headers.hxx> #include <GLTFAsset.h> #endif commit b00b7a68a743db60e14a375140d3dfa1c9e6de48 Author: Stephan Bergmann <[email protected]> Date: Fri Oct 17 11:15:38 2014 +0200 -Werror,-Wunused-private-field Change-Id: I8f312a511b383e1f0f7943a210935386869035b1 diff --git a/include/avmedia/mediaplayer.hxx b/include/avmedia/mediaplayer.hxx index 52d351e..101c6c6 100644 --- a/include/avmedia/mediaplayer.hxx +++ b/include/avmedia/mediaplayer.hxx @@ -56,7 +56,6 @@ private: virtual void ToggleFloatingMode() SAL_OVERRIDE; MediaWindow* mpMediaWindow; - Size maLastSize; }; inline MediaFloater * getMediaFloater() { _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
