src/hb-private.hh | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 2aae617a84f47836f10efd30df43e13e3a9447e1
Author: Behdad Esfahbod <beh...@behdad.org>
Date: Wed Jul 11 17:27:23 2018 +0200
Move _hb_alignof later again
It uses constexpr...
diff --git a/src/hb-private.hh b/src/hb-private.hh
index 74b9e274..ddb256f8 100644
--- a/src/hb-private.hh
+++ b/src/hb-private.hh
@@ -84,19 +84,9 @@ extern "C" int hb_memalign_impl(void **memptr, size_t
alignment, size_t size);
#endif
-/* Compiler attributes */
-
-
-template <typename T>
-struct _hb_alignof
-{
- struct s
- {
- char c;
- T t;
- };
- static constexpr size_t value = offsetof (s, t);
-};
+/*
+ * Compiler attributes
+ * */
#if __cplusplus < 201103L
@@ -122,6 +112,16 @@ struct _hb_alignof
#define thread_local
#endif
+template <typename T>
+struct _hb_alignof
+{
+ struct s
+ {
+ char c;
+ T t;
+ };
+ static constexpr size_t value = offsetof (s, t);
+};
#ifndef alignof
#define alignof(x) (_hb_alignof<x>::value)
#endif // alignof
_______________________________________________
HarfBuzz mailing list
HarfBuzz@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/harfbuzz
