include/vcl/outdevstate.hxx | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 4be799fc8236dff1038e84dc522f6cac9f834cb7
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Oct 13 17:03:34 2014 +0100
build error: specialization in different namespace
Change-Id: Ic1730a49576a663a2e04a2386bd3962a21b6fc48
diff --git a/include/vcl/outdevstate.hxx b/include/vcl/outdevstate.hxx
index da3dc4e..ed84aa0 100644
--- a/include/vcl/outdevstate.hxx
+++ b/include/vcl/outdevstate.hxx
@@ -53,13 +53,14 @@ enum class PushFlags : sal_uInt16 {
//bool operator bool() { return static_cast<sal_uInt16>(*this) != 0; }
};
-template<>
-struct o3tl::typed_flags<PushFlags>: o3tl::is_typed_flags<PushFlags, 0xFFFF>
{};
+
+namespace o3tl
+{
+ template<> struct typed_flags<PushFlags> : is_typed_flags<PushFlags,
0xFFFF> {};
+}
#define PUSH_ALLTEXT (PushFlags::TEXTCOLOR | PushFlags::TEXTFILLCOLOR |
PushFlags::TEXTLINECOLOR | PushFlags::OVERLINECOLOR | PushFlags::TEXTALIGN |
PushFlags::TEXTLAYOUTMODE | PushFlags::TEXTLANGUAGE)
#define PUSH_ALLFONT (PUSH_ALLTEXT | PushFlags::FONT)
-
-
// LayoutModes for Complex Text Layout
// These are flag values, i.e they can be combined
enum ComplexTextLayoutMode
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
