From: Asger Hautop Drewsen <asgerdrewsen@gmail.com>
Date: Wed, 31 Jan 2018 19:23:20 +0000 (+0100)
Subject: Always prefer c++14 attributes if available
X-Git-Tag: upstream/1.9.3~8^2~68^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c129f480e777d795f9945bc9ae9dafe01f3772c4;p=platform%2Fupstream%2Flz4.git

Always prefer c++14 attributes if available
---

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))