commit bd45a762c62d08b848fef6ab6857350383967747
author Kyle Stachowicz <kylestach99@gmail.com> Thu Oct 06 00:07:43 2016 -0400
committer Brian Silverman <brians> Thu Oct 06 00:07:43 2016 -0400
tree 1b526841bac7f2f141877fa083d1ffa8d0c06005
parent 0fa8e70d101302e58aed1ba5c36c639212e5b8c2

Fix compilation for GCC 5+

Change-Id: I9fcf5e5e582e053ab2a4f46fd3893003dfeaa185

aos/common/type_traits.h

diff --git a/aos/common/type_traits.h b/aos/common/type_traits.h
index 4b5fa8c..53fae23 100644
--- a/aos/common/type_traits.h
+++ b/aos/common/type_traits.h
@@ -12,7 +12,7 @@
 struct has_trivial_copy_assign : public std::integral_constant<bool,
 // This changed between 4.4.5 and 4.6.3. Unless somebody discovers otherwise,
 // 4.6 seems like a reasonable place to switch.
-#if ((__GNUC__ < 4) || (__GNUC_MINOR__ < 6)) && !defined(__clang__)
+#if ((__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 6)) && !defined(__clang__)
     ::std::has_trivial_assign<Tp>::value> {};
 #else
     ::std::has_trivial_copy_assign<Tp>::value> {};