sw/source/filter/ww8/needed_cast.hxx | 2 - sw/source/filter/ww8/staticassert.hxx | 63 ---------------------------------- sw/source/filter/ww8/styles.cxx | 1 3 files changed, 66 deletions(-)
New commits: commit 091fde623d33a21162658d9f2338ab0b23e82a90 Author: Tor Lillqvist <t...@collabora.com> Date: Sat Aug 29 08:02:57 2015 +0300 Bin include file with unused stuff Change-Id: I6c4b78a673183252604da0fe2deff6e4a2fa60d6 diff --git a/sw/source/filter/ww8/needed_cast.hxx b/sw/source/filter/ww8/needed_cast.hxx index 2280f77..a7a6a04 100644 --- a/sw/source/filter/ww8/needed_cast.hxx +++ b/sw/source/filter/ww8/needed_cast.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_SW_SOURCE_FILTER_WW8_NEEDED_CAST_HXX #define INCLUDED_SW_SOURCE_FILTER_WW8_NEEDED_CAST_HXX -#include "staticassert.hxx" - namespace ww { template<typename Ret, typename Param> Ret checking_cast(Param in, Ret) diff --git a/sw/source/filter/ww8/staticassert.hxx b/sw/source/filter/ww8/staticassert.hxx deleted file mode 100644 index 274b5ee..0000000 --- a/sw/source/filter/ww8/staticassert.hxx +++ /dev/null @@ -1,63 +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_SW_SOURCE_FILTER_WW8_STATICASSERT_HXX -#define INCLUDED_SW_SOURCE_FILTER_WW8_STATICASSERT_HXX - -/* - Lifted direct from: - Modern C++ Design: Generic Programming and Design Patterns Applied - Section 2.1 - by Andrei Alexandrescu -*/ -namespace ww -{ - template<bool> class compile_time_check - { - public: - compile_time_check(...) {} - }; - - template<> class compile_time_check<false> - { - }; -} - - /* - Similar to assert, StaticAssert is only in operation when NDEBUG is not - defined. It will test its first argument at compile time and on failure - report the error message of the second argument, which must be a valid c++ - classname. i.e. no spaces, punctuation or reserved keywords. - */ -#ifndef NDEBUG -# define StaticAssert(test, errormsg) \ - do { \ - struct ERROR_##errormsg {}; \ - typedef ww::compile_time_check< (test) != 0 > tmplimpl; \ - tmplimpl aTemp = tmplimpl(ERROR_##errormsg()); \ - sizeof(aTemp); \ - } while (0) -#else -# define StaticAssert(test, errormsg) \ - do {} while (0) -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/ww8/styles.cxx b/sw/source/filter/ww8/styles.cxx index 2297c1b..3f74cf5 100644 --- a/sw/source/filter/ww8/styles.cxx +++ b/sw/source/filter/ww8/styles.cxx @@ -23,7 +23,6 @@ #include <algorithm> #include <rtl/ustring.hxx> #include <osl/diagnose.h> -#include "staticassert.hxx" namespace { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits