From 5fa9ce570dc59a3fc9eb47f28b3fed739f20ab23 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 10 Dec 2015 13:30:01 +0100 Subject: Fix order of SAL_WARN_UNUSED and DLLPUBLIC for clang-cl ...which, somewhat arbitrarily, expects GNU extension __attribute__((...)) to come before MSVC extension __declspec(...) with MaybeParseGNUAttributes(attrs); MaybeParseMicrosoftDeclSpecs(attrs); in Parser::ParseClassSpecifier (lib/Parse/ParseDeclCXX.cpp). Change-Id: I5936558c8fc08b278575b6c678cde6eccd4647fb --- include/tools/gen.hxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/tools/gen.hxx') diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx index 7a98f0a4e913..4cd4e6daad7f 100644 --- a/include/tools/gen.hxx +++ b/include/tools/gen.hxx @@ -71,7 +71,7 @@ inline bool Pair::operator != ( const Pair& rPair ) const // Point -class SAL_DLLPUBLIC_EXPORT SAL_WARN_UNUSED Point : public Pair +class SAL_WARN_UNUSED SAL_DLLPUBLIC_EXPORT Point : public Pair { public: Point() {} @@ -293,7 +293,7 @@ inline std::basic_ostream & operator <<( #define RECT_MAX LONG_MAX #define RECT_MIN LONG_MIN -class TOOLS_DLLPUBLIC SAL_WARN_UNUSED Rectangle +class SAL_WARN_UNUSED TOOLS_DLLPUBLIC Rectangle { public: Rectangle(); -- cgit