diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-12-10 13:30:01 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-12-10 13:30:01 +0100 |
commit | 5fa9ce570dc59a3fc9eb47f28b3fed739f20ab23 (patch) | |
tree | 6032150d8fe8b3825bd2feb65d3a677823becdd5 /include/basegfx/color | |
parent | 66bd1e491102de97ceeb1db5705a15ff2dd69a58 (diff) |
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
Diffstat (limited to 'include/basegfx/color')
-rw-r--r-- | include/basegfx/color/bcolor.hxx | 2 | ||||
-rw-r--r-- | include/basegfx/color/bcolormodifier.hxx | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/include/basegfx/color/bcolor.hxx b/include/basegfx/color/bcolor.hxx index 4358e056d26f..ae6fdf2b322d 100644 --- a/include/basegfx/color/bcolor.hxx +++ b/include/basegfx/color/bcolor.hxx @@ -40,7 +40,7 @@ namespace basegfx @see B3DTuple */ - class BASEGFX_DLLPUBLIC SAL_WARN_UNUSED BColor : public B3DTuple + class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC BColor : public B3DTuple { public: /** Create a Color with red, green and blue components from [0.0 to 1.0] diff --git a/include/basegfx/color/bcolormodifier.hxx b/include/basegfx/color/bcolormodifier.hxx index 52956aaca318..899c1537f74a 100644 --- a/include/basegfx/color/bcolormodifier.hxx +++ b/include/basegfx/color/bcolormodifier.hxx @@ -56,7 +56,7 @@ namespace basegfx All usages should handle instances of BColorModifier encapsulated into these shared pointers. */ - class BASEGFX_DLLPUBLIC SAL_WARN_UNUSED BColorModifier + class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC BColorModifier { private: BColorModifier(const BColorModifier&) = delete; @@ -89,7 +89,7 @@ namespace basegfx { /** convert color to gray */ - class BASEGFX_DLLPUBLIC SAL_WARN_UNUSED BColorModifier_gray : public BColorModifier + class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC BColorModifier_gray : public BColorModifier { private: protected: @@ -117,7 +117,7 @@ namespace basegfx returns a color where red green and blue are inverted using 1.0 - n */ - class BASEGFX_DLLPUBLIC SAL_WARN_UNUSED BColorModifier_invert : public BColorModifier + class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC BColorModifier_invert : public BColorModifier { private: protected: @@ -149,7 +149,7 @@ namespace basegfx This derivation is used for the svg importer and does exactly what SVG defines for this needed case. */ - class BASEGFX_DLLPUBLIC SAL_WARN_UNUSED BColorModifier_luminance_to_alpha : public BColorModifier + class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC BColorModifier_luminance_to_alpha : public BColorModifier { private: protected: @@ -179,7 +179,7 @@ namespace basegfx given color, replacing everything. Useful e.g. for unified shadow creation */ - class BASEGFX_DLLPUBLIC SAL_WARN_UNUSED BColorModifier_replace : public BColorModifier + class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC BColorModifier_replace : public BColorModifier { private: ::basegfx::BColor maBColor; @@ -216,7 +216,7 @@ namespace basegfx col * (1 - f) + aSourceColor * f */ - class BASEGFX_DLLPUBLIC SAL_WARN_UNUSED BColorModifier_interpolate : public BColorModifier + class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC BColorModifier_interpolate : public BColorModifier { private: ::basegfx::BColor maBColor; @@ -254,7 +254,7 @@ namespace basegfx returns black when the luminance of the given color is less than the given treshhold value in the range [0.0 .. 1.0], else white */ - class BASEGFX_DLLPUBLIC SAL_WARN_UNUSED BColorModifier_black_and_white : public BColorModifier + class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC BColorModifier_black_and_white : public BColorModifier { private: double mfValue; @@ -291,7 +291,7 @@ namespace basegfx col(r,g,b) = clamp(pow(col(r,g,b), 1.0 / gamma), 0.0, 1.0) */ - class BASEGFX_DLLPUBLIC SAL_WARN_UNUSED BColorModifier_gamma : public BColorModifier + class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC BColorModifier_gamma : public BColorModifier { private: double mfValue; @@ -329,7 +329,7 @@ namespace basegfx - be able to cover a bigger change range utilizing the combination - allow execution by a small, common, precalculated table */ - class BASEGFX_DLLPUBLIC SAL_WARN_UNUSED BColorModifier_RGBLuminanceContrast : public BColorModifier + class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC BColorModifier_RGBLuminanceContrast : public BColorModifier { private: double mfRed; |