summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAsger Hautop Drewsen <asgerdrewsen@gmail.com>2018-01-31 19:23:20 (GMT)
committerAsger Hautop Drewsen <asgerdrewsen@gmail.com>2018-01-31 19:24:44 (GMT)
commitc129f480e777d795f9945bc9ae9dafe01f3772c4 (patch)
tree93355eb3c248fd4de4fa3e0e4cf579cb4224ce41
parent865bd83e13590dc4a4c82f559f454cefcd86fd69 (diff)
downloadlz4-c129f480e777d795f9945bc9ae9dafe01f3772c4.zip
lz4-c129f480e777d795f9945bc9ae9dafe01f3772c4.tar.gz
lz4-c129f480e777d795f9945bc9ae9dafe01f3772c4.tar.bz2
Always prefer c++14 attributes if available
-rw-r--r--lib/lz4.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/lz4.h b/lib/lz4.h
index df85472..6179c05 100644
--- a/lib/lz4.h
+++ b/lib/lz4.h
@@ -433,11 +433,9 @@ union LZ4_streamDecode_u {
# define LZ4_DEPRECATED(message) /* disable deprecation warnings */
#else
# define LZ4_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
-# if defined(__clang__) /* clang doesn't handle mixed C++11 and CNU attributes */
-# define LZ4_DEPRECATED(message) __attribute__((deprecated(message)))
-# elif defined (__cplusplus) && (__cplusplus >= 201402) /* C++14 or greater */
+# if defined (__cplusplus) && (__cplusplus >= 201402) /* C++14 or greater */
# define LZ4_DEPRECATED(message) [[deprecated(message)]]
-# elif (LZ4_GCC_VERSION >= 405)
+# elif (LZ4_GCC_VERSION >= 405) || defined(__clang__)
# define LZ4_DEPRECATED(message) __attribute__((deprecated(message)))
# elif (LZ4_GCC_VERSION >= 301)
# define LZ4_DEPRECATED(message) __attribute__((deprecated))